Skip to content

Commit

Permalink
✅ add regression test for #2281
Browse files Browse the repository at this point in the history
  • Loading branch information
nlohmann committed Jul 22, 2020
1 parent 4d63252 commit c4356c6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
1 change: 0 additions & 1 deletion test/cmake_target_include_directories/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
6 changes: 2 additions & 4 deletions test/cmake_target_include_directories/project/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit c4356c6

Please sign in to comment.