Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
c4356c68
Unverified
Commit
c4356c68
authored
Jul 22, 2020
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✅
add regression test for #2281
parent
4d63252c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
test/cmake_target_include_directories/CMakeLists.txt
test/cmake_target_include_directories/CMakeLists.txt
+0
-1
test/cmake_target_include_directories/project/CMakeLists.txt
test/cmake_target_include_directories/project/CMakeLists.txt
+2
-4
No files found.
test/cmake_target_include_directories/CMakeLists.txt
View file @
c4356c68
...
...
@@ -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
)
...
...
test/cmake_target_include_directories/project/CMakeLists.txt
View file @
c4356c68
...
...
@@ -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
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment