Skip to content

Commit f3f5588

Browse files
authored
Merge pull request #322 from mathstuf/cmake-module-behavior
Cmake module behavior
2 parents e92b477 + 3b0298f commit f3f5588

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.14.0)
1+
cmake_minimum_required(VERSION 3.14...3.29)
22

33
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.29.20240416")
44
set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD "0e5b6991-d74f-4b3d-a41c-cf096e0b2508")
@@ -92,7 +92,7 @@ if(CTRE_MODULE)
9292
)
9393

9494
# we are using `import std;`
95-
if (CTRE_CXX_STANDARD LESS 23)
95+
if (NOT DEFINED CTRE_CXX_STANDARD OR CTRE_CXX_STANDARD LESS 23)
9696
set(CTRE_CXX_STANDARD 23)
9797
endif()
9898

@@ -113,6 +113,7 @@ else()
113113
endif()
114114

115115
target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_${CTRE_CXX_STANDARD})
116+
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_SCAN_FOR_MODULES 0)
116117

117118
install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-targets)
118119
endif()

0 commit comments

Comments
 (0)