mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-06-11 18:39:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Make changes as requested

Browse Source 
Signed-off-by: Toyosatomimi no Miko <110693261+mikomikotaishi@users.noreply.github.com>
This commit is contained in:
Toyosatomimi no Miko 2025-05-31 13:25:35 -04:00
parent d9329b8c7a
commit 05536f2f8f
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ubuntu.yml vendored
View File

@ -232,7 +232,7 @@ jobs:
- name: Get latest CMake and ninja - name: Get latest CMake and ninja
uses: lukka/get-cmake@ea004816823209b8d1211e47b216185caee12cc5 # v4.02 uses: lukka/get-cmake@ea004816823209b8d1211e47b216185caee12cc5 # v4.02
- name: Run CMake - 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 - name: Build
run: cmake --build build --target ci_module_cpp20 run: cmake --build build --target ci_module_cpp20

2
CMakeLists.txt
View File

@ -32,8 +32,6 @@ if(NLOHMANN_JSON_BUILD_MODULES)
else() else()
message(WARNING "Skipping nlohmann-json C++ modules (requires CMake 3.28+, found ${CMAKE_VERSION})") message(WARNING "Skipping nlohmann-json C++ modules (requires CMake 3.28+, found ${CMAKE_VERSION})")
endif() endif()
else()
message(STATUS "nlohmann-json C++ modules support is disabled. Enable with -DNLOHMANN_JSON_BUILD_MODULES=ON")
endif() endif()
## ##

3
cmake/ci.cmake
View File

@ -665,7 +665,8 @@ add_custom_target(ci_cuda_example
add_custom_target(ci_module_cpp20 add_custom_target(ci_module_cpp20
COMMAND ${CMAKE_COMMAND} 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 -S${PROJECT_SOURCE_DIR}/tests/module_cpp20 -B${PROJECT_BINARY_DIR}/ci_module_cpp20
COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/ci_module_cpp20 COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/ci_module_cpp20
) )