Add support for CMake find_package() #106
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
Added export configuration for UnitTest++ target and installed the export and config file in libs/cmake/UnitTest++.
Added basic UnitTest++Config.cmake file which includes exported targets file and sets UTPP_INCLUDE_DIRS to the install location of the includes directory, this allows UnitTest++ to be used as a normal target in your own CMakeLists.txt file.
e.g.:
find_package(UnitTest++ REQUIRED NO_MODULE)
add_executable(foo ...)
include_directories(${UTPP_INCLUDE_DIRS})
target_link_libraries(foo UnitTest++)
which will ensure the library and installed headers paths are set up correctly for your own target.
|
Looks good, thanks for the PR. I'm on vacation but I'll give it a go when I get home, unless somebody else wants to vouch for it. |
pjohnmeyer
added a commit
that referenced
this pull request
Apr 20, 2016
Add support for CMake find_package() Fixes #99
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.
I had a need for this and noticed that it's also a current issue (#99).
The end result is you can import UnitTest++ in your CMakeLists.txt via:
More can be done with this including adding proper version checking support but i'm not sure how to go about that with a minimum CMake version of 2.8.1 since I don't have much experience with it. There's an easier method with more recent versions of CMake using CMakePackageConfigHelpers module and setting the version in the project() call.
A more recent version of CMake would also allow setting the install include directory as part of the imported target meaning you can drop include_directories(${UTPP_INCLUDE_DIRS}) calls when linking the target.
Worth noting that the config file doesn't deal with changing '++' to 'pp' but it looks like the CMakeLists.txt has sort of broken that functionality since it was originally put in and i'm not sure if I should approach that issue here.