Skip to content

Commit 2705d3a

Browse files
committed
[brief] Fixes install logic.
[detailed] - Makes sure that unit tests are not enabled by default. Targets that import Zeus should not have to manually set the building of the unit tests to false, this should be up to the presets. - Fixes the name of the installed config file to ensure it matches the version file so specific versions of Zeus can be found.
1 parent e0b13f8 commit 2705d3a

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ set(ZEUS_VERSION_FULL
2222
#================================
2323
# Option variables.
2424
#================================
25-
option(ZEUS_BUILD_TESTS "Build Zeus unit tests" ON)
25+
option(ZEUS_BUILD_TESTS "Build Zeus unit tests" OFF)
2626
option(ZEUS_INSTALL_TARGET "Create install target" OFF)
2727

2828
#================================
@@ -127,7 +127,7 @@ if (ZEUS_INSTALL_TARGET)
127127
)
128128

129129
install(FILES
130-
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/zeus-config.cmake"
130+
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/zeusConfig.cmake"
131131
"${CMAKE_CURRENT_BINARY_DIR}/zeusConfigVersion.cmake"
132132
DESTINATION lib/cmake/zeus
133133
)

CMakePresets.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"cacheVariables": {
1616
"CMAKE_CXX_FLAGS": "/W4 /WX /MP /EHsc -DNOMINMAX",
1717
"CMAKE_CXX_FLAGS_DEBUG": "/ZI",
18-
"CMAKE_CXX_STANDARD": "20"
18+
"CMAKE_CXX_STANDARD": "20",
19+
"ZEUS_BUILD_TESTS": "ON"
1920
}
2021
},
2122
{
@@ -27,7 +28,8 @@
2728
"cacheVariables": {
2829
"CMAKE_CXX_FLAGS": "-Wall -Wextra -pedantic -Werror",
2930
"CMAKE_CXX_FLAGS_DEBUG": "-g",
30-
"CMAKE_CXX_STANDARD": "20"
31+
"CMAKE_CXX_STANDARD": "20",
32+
"ZEUS_BUILD_TESTS": "ON"
3133
}
3234
},
3335
{
@@ -39,7 +41,8 @@
3941
"cacheVariables": {
4042
"CMAKE_CXX_FLAGS": "-Wall -Wextra -pedantic -Werror -stdlib=libstdc++",
4143
"CMAKE_CXX_FLAGS_DEBUG": "-g",
42-
"CMAKE_CXX_STANDARD": "20"
44+
"CMAKE_CXX_STANDARD": "20",
45+
"ZEUS_BUILD_TESTS": "ON"
4346
}
4447
}
4548
]

0 commit comments

Comments
 (0)