CMake dependencies cleanups #3888
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
|
Can you test this with |
chriseth
approved these changes
Apr 16, 2018
axic
reviewed
Apr 17, 2018
| add_library(devcore ${sources} ${headers}) | ||
| target_link_libraries(devcore PRIVATE ${JSONCPP_LIBRARY} ${Boost_FILESYSTEM_LIBRARIES} ${Boost_REGEX_LIBRARIES} ${Boost_SYSTEM_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) | ||
| target_include_directories(devcore SYSTEM PUBLIC ${Boost_INCLUDE_DIRS}) | ||
| target_link_libraries(devcore PRIVATE jsoncpp ${Boost_FILESYSTEM_LIBRARIES} ${Boost_REGEX_LIBRARIES} ${Boost_SYSTEM_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) |
Contributor
There was a problem hiding this comment.
@chfast isn't this interfering with cmake/jsoncpp.cmake? That defines ${JSONCPP_LIBRARY} which isn't used anymore.
Contributor
Author
There was a problem hiding this comment.
Yeah... Might be good to add it back because I'm not sure what the order will be without it.
Can you try adding
target_include_directories(devcore SYSTEM BEFORE PUBLIC ${JSONCPP_INCLUDE_DIR})
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3883.