Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Externals Update, main branch (2024.08.14.) #673

Merged
merged 2 commits into from
Aug 14, 2024
Merged

Externals Update, main branch (2024.08.14.) #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46eaf14
Update GoogleTest and VecMem to their latest versions.
krasznaa Aug 14, 2024
cc3a3d2
Added some missing includes.
krasznaa Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions extern/googletest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# TRACCC library, part of the ACTS project (R&D line)
#
# (c) 2021-2022 CERN for the benefit of the ACTS project
# (c) 2021-2024 CERN for the benefit of the ACTS project
#
# Mozilla Public License Version 2.0

Expand All @@ -18,7 +18,7 @@ message( STATUS "Building GoogleTest as part of the TRACCC project" )

# Declare where to get GoogleTest from.
set( TRACCC_GOOGLETEST_SOURCE
"URL;https://github.com/google/googletest/archive/release-1.11.0.tar.gz;URL_MD5;e8a8df240b6938bb6384155d4c37d937"
"URL;https://github.com/google/googletest/archive/refs/tags/v1.15.2.tar.gz;URL_MD5;7e11f6cfcf6498324ac82d567dcb891e"
CACHE STRING "Source for GoogleTest, when built as part of this project" )
mark_as_advanced( TRACCC_GOOGLETEST_SOURCE )
FetchContent_Declare( GoogleTest ${TRACCC_GOOGLETEST_SOURCE} )
Expand Down
2 changes: 1 addition & 1 deletion extern/vecmem/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ message( STATUS "Building VecMem as part of the TRACCC project" )

# Declare where to get VecMem from.
set( TRACCC_VECMEM_SOURCE
"URL;https://github.com/acts-project/vecmem/archive/refs/tags/v1.6.0.tar.gz;URL_MD5;1af26e9d27e4b24e68028d041869e95f"
"URL;https://github.com/acts-project/vecmem/archive/refs/tags/v1.7.0.tar.gz;URL_MD5;4544ec9b3686fdae558b613d9ea12233"
CACHE STRING "Source for VecMem, when built as part of this project" )
mark_as_advanced( TRACCC_VECMEM_SOURCE )
FetchContent_Declare( VecMem ${TRACCC_VECMEM_SOURCE} )
Expand Down
4 changes: 4 additions & 0 deletions tests/common/tests/cca_test.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@

// System include(s).
#include <functional>
#include <iomanip>
#include <map>
#include <sstream>
#include <string>

using cca_function_t = std::function<
std::map<traccc::geometry_id, vecmem::vector<traccc::measurement>>(
Expand Down
Loading