fix: test_package building fixed

mpusz · Apr 17, 2024 · 437a9d5 · 437a9d5
1 parent 56be073
commit 437a9d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/test_package/CMakeLists.txt b/test_package/CMakeLists.txt
@@ -37,5 +37,7 @@ if(MP_UNITS_BUILD_CXX_MODULES)
     add_executable(test_package test_package.cpp)
     target_compile_features(test_package PRIVATE cxx_std_20)
     target_link_libraries(test_package PRIVATE mp-units::mp-units)
-    target_compile_definitions(test_package PRIVATE MP_UNITS_MODULES MP_UNITS_API_STD_FORMAT=$<BOOL:${MP_UNITS_API_STD_FORMAT}>)
+    target_compile_definitions(
+        test_package PRIVATE MP_UNITS_MODULES MP_UNITS_API_STD_FORMAT=$<BOOL:${MP_UNITS_API_STD_FORMAT}>
+    )
 endif()
diff --git a/test_package/conanfile.py b/test_package/conanfile.py
@@ -40,10 +40,11 @@ def layout(self):
     def generate(self):
         tc = CMakeToolchain(self)
         if self.dependencies["mp-units"].options.cxx_modules:
-            tc.variables["MP_UNITS_BUILD_CXX_MODULES"] = True
-        tc.variables["MP_UNITS_API_STD_FORMAT"] = bool(
+            tc.cache_variables["CMAKE_CXX_SCAN_FOR_MODULES"] = True
+            tc.cache_variables["MP_UNITS_BUILD_CXX_MODULES"] = True
+        tc.cache_variables["MP_UNITS_API_STD_FORMAT"] = str(
             self.dependencies["mp-units"].options.std_format
-        )
+        ).upper()
         tc.generate()
 
     def build(self):