Skip to content

Commit c967193

Browse files
committed
Set BEMAN_USE_MODULES in presets
1 parent ea2d975 commit c967193

3 files changed

Lines changed: 23 additions & 13 deletions

File tree

CMakePresets.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"generator": "Ninja",
88
"binaryDir": "${sourceDir}/build/${presetName}",
99
"cacheVariables": {
10+
"BEMAN_USE_MODULES": true,
1011
"CMAKE_CXX_STANDARD": "23",
1112
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
1213
"CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "./infra/cmake/use-fetch-content.cmake"
@@ -79,6 +80,7 @@
7980
"_debug-base"
8081
],
8182
"cacheVariables": {
83+
"BEMAN_USE_MODULES": false,
8284
"CMAKE_TOOLCHAIN_FILE": "infra/cmake/appleclang-toolchain.cmake"
8385
}
8486
},
@@ -90,6 +92,7 @@
9092
"_release-base"
9193
],
9294
"cacheVariables": {
95+
"BEMAN_USE_MODULES": false,
9396
"CMAKE_TOOLCHAIN_FILE": "infra/cmake/appleclang-toolchain.cmake"
9497
}
9598
},

examples/CMakeLists.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,16 @@ foreach(example ${ALL_EXAMPLES})
3232
PUBLIC cxx_std_23
3333
)
3434
# XXX set_target_properties(beman.transform_view.examples.${example} PROPERTIES CXX_MODULE_STD ON)
35+
target_link_libraries(
36+
beman.transform_view.examples.${example}
37+
PRIVATE beman::transform_view_module
38+
)
39+
else()
40+
target_link_libraries(
41+
beman.transform_view.examples.${example}
42+
PRIVATE beman::transform_view
43+
)
3544
endif()
36-
target_link_libraries(
37-
beman.transform_view.examples.${example}
38-
PRIVATE beman::transform_view_module
39-
)
4045
add_test(
4146
NAME beman.transform_view.examples.${example}
4247
COMMAND beman.transform_view.examples.${example}

tests/beman/transform_view/CMakeLists.txt

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,17 @@ target_link_libraries(
1212
PRIVATE beman::transform_view GTest::gtest GTest::gtest_main
1313
)
1414

15-
add_executable(beman.transform_view.tests.module_smoke_test)
16-
target_sources(
17-
beman.transform_view.tests.module_smoke_test
18-
PRIVATE module_smoke_test.test.cpp
19-
)
20-
target_link_libraries(
21-
beman.transform_view.tests.module_smoke_test
22-
PRIVATE beman::transform_view_module
23-
)
15+
if(BEMAN_USE_MODULES)
16+
add_executable(beman.transform_view.tests.module_smoke_test)
17+
target_sources(
18+
beman.transform_view.tests.module_smoke_test
19+
PRIVATE module_smoke_test.test.cpp
20+
)
21+
target_link_libraries(
22+
beman.transform_view.tests.module_smoke_test
23+
PRIVATE beman::transform_view_module
24+
)
25+
endif()
2426

2527
include(GoogleTest)
2628
gtest_discover_tests(beman.transform_view.tests.transform_view)

0 commit comments

Comments
 (0)