diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 4ee115182..9ebe45b91 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -232,7 +232,7 @@ jobs: - name: Get latest CMake and ninja uses: lukka/get-cmake@ea004816823209b8d1211e47b216185caee12cc5 # v4.02 - name: Run CMake - run: cmake -S . -B build -G Ninja -DJSON_CI=On -DNLOHMANN_JSON_BUILD_MODULES=ON -DJSON_Install=ON + run: cmake -S . -B build -DJSON_CI=On - name: Build run: cmake --build build --target ci_module_cpp20 diff --git a/CMakeLists.txt b/CMakeLists.txt index edc7108be..8529ab641 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,8 +32,6 @@ if(NLOHMANN_JSON_BUILD_MODULES) else() message(WARNING "Skipping nlohmann-json C++ modules (requires CMake 3.28+, found ${CMAKE_VERSION})") endif() -else() - message(STATUS "nlohmann-json C++ modules support is disabled. Enable with -DNLOHMANN_JSON_BUILD_MODULES=ON") endif() ## diff --git a/cmake/ci.cmake b/cmake/ci.cmake index 8c0d2106b..a4da7741d 100644 --- a/cmake/ci.cmake +++ b/cmake/ci.cmake @@ -665,7 +665,8 @@ add_custom_target(ci_cuda_example add_custom_target(ci_module_cpp20 COMMAND ${CMAKE_COMMAND} - -DCMAKE_BUILD_TYPE=Debug -GNinja + -DCMAKE_BUILD_TYPE=Debug -GNinja + -DJSON_CI=On -DNLOHMANN_JSON_BUILD_MODULES=ON -DJSON_Install=ON -S${PROJECT_SOURCE_DIR}/tests/module_cpp20 -B${PROJECT_BINARY_DIR}/ci_module_cpp20 COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/ci_module_cpp20 )