Fix Windows CI (#4897)

* 👷 fix Windows CI Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 👷 fix Windows CI Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 👷 fix Windows CI Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 👷 fix Windows CI Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 👷 fix Windows CI Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 👷 fix Windows CI Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 👷 fix Windows CI Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 👷 fix Windows CI Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 👷 fix Windows CI Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 👷 fix Windows CI Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 👷 fix Windows CI Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 👷 fix Windows CI Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 👷 fix Windows CI Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 👷 fix Windows CI Signed-off-by: Niels Lohmann <mail@nlohmann.me> --------- Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2025-11-24 11:54:34 +08:00 · 2025-08-28 16:21:01 +02:00
parent ec857100a5
commit 4bc4e37f4f
20 changed files with 142 additions and 111 deletions
--- a/tests/cmake_import_minver/CMakeLists.txt
+++ b/tests/cmake_import_minver/CMakeLists.txt
@@ -3,6 +3,7 @@ add_test(NAME cmake_import_minver_configure
    -G "${CMAKE_GENERATOR}"
    -A "${CMAKE_GENERATOR_PLATFORM}"
    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
    -Dnlohmann_json_DIR=${PROJECT_BINARY_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}/project
 )
--- a/tests/cmake_import_minver/project/CMakeLists.txt
+++ b/tests/cmake_import_minver/project/CMakeLists.txt
@@ -4,5 +4,9 @@ project(DummyImportMinVer CXX)

 find_package(nlohmann_json 3.2.0 REQUIRED)

+if(MSVC)
+    add_compile_options(/EHsc)
+endif()
+
 add_executable(with_namespace_target main.cpp)
 target_link_libraries(with_namespace_target nlohmann_json::nlohmann_json)
--- a/tests/cmake_import_minver/project/main.cpp
+++ b/tests/cmake_import_minver/project/main.cpp
@@ -8,7 +8,7 @@

 #include <nlohmann/json.hpp>

-int main(int argc, char** argv)
+int main()
 {
    nlohmann::json j;