From c4356c68e07eba22e5fdd53bd036ee3332b5e87e Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 22 Jul 2020 12:38:39 +0200 Subject: [PATCH] :white_check_mark: add regression test for #2281 --- test/cmake_target_include_directories/CMakeLists.txt | 1 - .../cmake_target_include_directories/project/CMakeLists.txt | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/test/cmake_target_include_directories/CMakeLists.txt b/test/cmake_target_include_directories/CMakeLists.txt index d0f3335fa1..da738ea4fe 100644 --- a/test/cmake_target_include_directories/CMakeLists.txt +++ b/test/cmake_target_include_directories/CMakeLists.txt @@ -2,7 +2,6 @@ add_test(NAME cmake_target_include_directories_configure COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_BUILD_TYPE=Debug -Dnlohmann_json_source=${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/project ) diff --git a/test/cmake_target_include_directories/project/CMakeLists.txt b/test/cmake_target_include_directories/project/CMakeLists.txt index 36f3da0cb5..a5e0919de5 100644 --- a/test/cmake_target_include_directories/project/CMakeLists.txt +++ b/test/cmake_target_include_directories/project/CMakeLists.txt @@ -11,13 +11,11 @@ target_include_directories(with_private_system_target PRIVATE SYSTEM ${nlohmann_ set_target_properties(with_private_system_target PROPERTIES CXX_STANDARD 11) # regression from https://github.com/nlohmann/json/discussions/2281 -add_library(Foo SHARED) -target_sources(Foo PRIVATE Foo.cpp Bar.cpp) +add_library(Foo SHARED Foo.cpp Bar.cpp) target_include_directories(Foo PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${nlohmann_json_source}/include) set_target_properties(Foo PROPERTIES CXX_STANDARD 11) -add_library(Bar SHARED) -target_sources(Bar PRIVATE Bar.cpp) +add_library(Bar SHARED PRIVATE Bar.cpp) target_link_libraries(Bar PRIVATE Foo) target_include_directories(Bar PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${nlohmann_json_source}/include) set_target_properties(Bar PROPERTIES CXX_STANDARD 11)