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>
2026-04-04 23:28:54 +00: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_add_subdirectory/CMakeLists.txt
+++ b/tests/cmake_add_subdirectory/CMakeLists.txt
@@ -2,6 +2,7 @@ add_test(NAME cmake_add_subdirectory_configure
  COMMAND ${CMAKE_COMMAND}
    -G "${CMAKE_GENERATOR}"
    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
    -Dnlohmann_json_source=${PROJECT_SOURCE_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}/project
 )
--- a/tests/cmake_add_subdirectory/project/CMakeLists.txt
+++ b/tests/cmake_add_subdirectory/project/CMakeLists.txt
@@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.5...3.14)

 project(DummyImport CXX)

+if(MSVC)
+    add_compile_options(/EHsc)
+endif()
+
 set(JSON_BuildTests OFF CACHE INTERNAL "")
 add_subdirectory(${nlohmann_json_source}
   ${CMAKE_CURRENT_BINARY_DIR}/nlohmann_json)
--- a/tests/cmake_add_subdirectory/project/main.cpp
+++ b/tests/cmake_add_subdirectory/project/main.cpp
@@ -8,7 +8,7 @@

 #include <nlohmann/json.hpp>

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

--- a/tests/cmake_fetch_content/CMakeLists.txt
+++ b/tests/cmake_fetch_content/CMakeLists.txt
@@ -3,6 +3,7 @@ if (${CMAKE_VERSION} VERSION_GREATER "3.11.0")
    COMMAND ${CMAKE_COMMAND}
    -G "${CMAKE_GENERATOR}"
    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
    -Dnlohmann_json_source=${PROJECT_SOURCE_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}/project
  )
--- a/tests/cmake_fetch_content/project/CMakeLists.txt
+++ b/tests/cmake_fetch_content/project/CMakeLists.txt
@@ -13,6 +13,10 @@ if(NOT json_POPULATED)
  add_subdirectory(${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL)
 endif()

+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_fetch_content/project/main.cpp
+++ b/tests/cmake_fetch_content/project/main.cpp
@@ -8,7 +8,7 @@

 #include <nlohmann/json.hpp>

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

--- a/tests/cmake_fetch_content2/CMakeLists.txt
+++ b/tests/cmake_fetch_content2/CMakeLists.txt
@@ -3,6 +3,7 @@ if (${CMAKE_VERSION} VERSION_GREATER "3.14.0")
    COMMAND ${CMAKE_COMMAND}
    -G "${CMAKE_GENERATOR}"
    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
    -Dnlohmann_json_source=${PROJECT_SOURCE_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}/project
  )
--- a/tests/cmake_fetch_content2/project/CMakeLists.txt
+++ b/tests/cmake_fetch_content2/project/CMakeLists.txt
@@ -8,6 +8,10 @@ get_filename_component(GIT_REPOSITORY_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../.
 FetchContent_Declare(json GIT_REPOSITORY ${GIT_REPOSITORY_DIRECTORY} GIT_TAG HEAD)
 FetchContent_MakeAvailable(json)

+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_fetch_content2/project/main.cpp
+++ b/tests/cmake_fetch_content2/project/main.cpp
@@ -8,7 +8,7 @@

 #include <nlohmann/json.hpp>

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

--- a/tests/cmake_import/CMakeLists.txt
+++ b/tests/cmake_import/CMakeLists.txt
@@ -3,6 +3,7 @@ add_test(NAME cmake_import_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/project/CMakeLists.txt
+++ b/tests/cmake_import/project/CMakeLists.txt
@@ -4,9 +4,12 @@ project(DummyImport CXX)

 find_package(nlohmann_json 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)

 add_executable(without_namespace_target main.cpp)
 target_link_libraries(without_namespace_target nlohmann_json)
-
--- a/tests/cmake_import/project/main.cpp
+++ b/tests/cmake_import/project/main.cpp
@@ -8,7 +8,7 @@

 #include <nlohmann/json.hpp>

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

--- 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;

--- a/tests/cmake_target_include_directories/CMakeLists.txt
+++ b/tests/cmake_target_include_directories/CMakeLists.txt
@@ -2,6 +2,7 @@ add_test(NAME cmake_target_include_directories_configure
  COMMAND ${CMAKE_COMMAND}
    -G "${CMAKE_GENERATOR}"
    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
    -Dnlohmann_json_source=${PROJECT_SOURCE_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}/project
 )
--- a/tests/cmake_target_include_directories/project/CMakeLists.txt
+++ b/tests/cmake_target_include_directories/project/CMakeLists.txt
@@ -2,12 +2,16 @@ cmake_minimum_required(VERSION 3.5...3.14)

 project(DummyImport CXX)

+if(MSVC)
+    add_compile_options(/EHsc)
+endif()
+
 add_executable(with_private_target main.cpp)
 target_include_directories(with_private_target PRIVATE ${nlohmann_json_source}/include)
 set_target_properties(with_private_target PROPERTIES CXX_STANDARD 11)

 add_executable(with_private_system_target main.cpp)
-target_include_directories(with_private_system_target PRIVATE SYSTEM ${nlohmann_json_source}/include)
+target_include_directories(with_private_system_target SYSTEM PRIVATE ${nlohmann_json_source}/include)
 set_target_properties(with_private_system_target PROPERTIES CXX_STANDARD 11)

 # regression from https://github.com/nlohmann/json/discussions/2281
--- a/tests/cmake_target_include_directories/project/main.cpp
+++ b/tests/cmake_target_include_directories/project/main.cpp
@@ -8,7 +8,7 @@

 #include <nlohmann/json.hpp>

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