Skip to content

Commit 2f999e2

Browse files
committed
Disable Eigen tests
1 parent 8e78fbf commit 2f999e2

File tree

2 files changed

+21
-13
lines changed

2 files changed

+21
-13
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ jobs:
5151
uses: actions/checkout@v4
5252
- name: Install dependencies
5353
run: |-
54-
brew install eigen catch2
54+
brew install cmake eigen catch2
55+
cmake --version
5556
- name: Configure Cmake
5657
run: |-
5758
cmake ./ -B build -DCMAKE_BUILD_TYPE=Debug -DTINYOPT_BUILD_TESTS=ON -DTINYOPT_BUILD_DOCS=OFF

cmake/ThirdParties.cmake

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ include(FetchContent)
55

66
# For now, Eigen is mandatory
77
find_package(Eigen3 QUIET)
8+
89
if (EIGEN3_FOUND)
910
message("Eigen3 found at ${EIGEN3_INCLUDE_DIR}")
1011
else()
@@ -18,11 +19,11 @@ else()
1819
)
1920
block (SCOPE_FOR VARIABLES) # requires cmake 3.25+
2021
set(BUILD_TESTING OFF)
21-
set(EIGEN_BUILD_TESTING OFF)
22-
set(EIGEN_TEST_CXX11 OFF)
23-
set(EIGEN_HAS_CXX11_MATH ON)
22+
set(EIGEN_BUILD_TESTS OFF)
2423
set(EIGEN_BUILD_DOC OFF)
24+
set(EIGEN_BUILD_DEMOS OFF)
2525
set(EIGEN_BUILD_PKGCONFIG OFF)
26+
set(EIGEN_TEST_CXX11 OFF)
2627
FetchContent_MakeAvailable(Eigen)
2728
endblock ()
2829
set(EIGEN3_INCLUDE_DIR "${eigen3_SOURCE_DIR}" CACHE PATH "Eigen3 include directory" FORCE)
@@ -47,11 +48,13 @@ if (TINYOPT_BUILD_CERES)
4748
GIT_TAG 2.2.0
4849
GIT_SHALLOW TRUE
4950
GIT_PROGRESS TRUE)
50-
set(BUILD_TESTING OFF)
51-
set(BUILD_EXAMPLES OFF)
52-
set(BUILD_BENCHMARKS OFF)
53-
set(MINIGLOG ON)
54-
FetchContent_MakeAvailable(Ceres)
51+
block (SCOPE_FOR VARIABLES) # requires cmake 3.25+
52+
set(BUILD_TESTING OFF)
53+
set(BUILD_EXAMPLES OFF)
54+
set(BUILD_BENCHMARKS OFF)
55+
set(MINIGLOG ON)
56+
FetchContent_MakeAvailable(Ceres)
57+
endblock ()
5558
set(CERES_LIBRARIES Ceres::ceres)
5659
target_compile_options(ceres PUBLIC "-Wno-reorder" "-Wno-maybe-uninitialized")
5760
endif ()
@@ -74,8 +77,10 @@ if (TINYOPT_BUILD_SOPHUS_TEST)
7477
PATCH_COMMAND ${SOPHUS_FIX_CMAKE_VER}
7578
UPDATE_DISCONNECTED 1
7679
)
77-
set(BUILD_SOPHUS_TESTS OFF)
78-
FetchContent_MakeAvailable(Sophus)
80+
block (SCOPE_FOR VARIABLES) # requires cmake 3.25+
81+
set(BUILD_SOPHUS_TESTS OFF)
82+
FetchContent_MakeAvailable(Sophus)
83+
endblock ()
7984
endif ()
8085
add_definitions(-DHAS_SOPHUS)
8186
#include_directories(${Sophus_SOURCE_DIR}/sophus)
@@ -96,8 +101,10 @@ if (TINYOPT_BUILD_LIEPLUSPLUS_TEST)
96101
GIT_SHALLOW TRUE
97102
GIT_PROGRESS TRUE
98103
)
99-
set(LIEPLUSPLUS_TESTS OFF)
100-
FetchContent_MakeAvailable(LiePlusPlus)
104+
block (SCOPE_FOR VARIABLES) # requires cmake 3.25+
105+
set(LIEPLUSPLUS_TESTS OFF)
106+
FetchContent_MakeAvailable(LiePlusPlus)
107+
endblock ()
101108
endif ()
102109
add_definitions(-DHAS_LIEPLUSPLUS)
103110
#include_directories(${LiePlusPlus_SOURCE_DIR}/include)

0 commit comments

Comments
 (0)