mirror of
https://github.com/nlohmann/json.git
synced 2025-11-24 11:54:34 +08:00
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>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include <nlohmann/json.hpp>
|
||||
|
||||
int main(int argc, char** argv)
|
||||
int main()
|
||||
{
|
||||
nlohmann::json j;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user