Improve the CMake config files #2315
Merged
Conversation
This file contains 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
Make use of the CMakePackageConfigHelpers (available already in cmake 3.1) to generate the OpenBabel3ConfigVersion.cmake file completely, and get rid of the local version. Mostly important, use CMakePackageConfigHelpers also for generating the bulk of OpenBabel3Config.cmake: the standard boilerplate from cmake is inserted, and that takes care of properly locating all the various paths from the installation directories. Fixes openbabel#2264.
Mark all the library dependencies of the openbabel library as private: this way, they will not be considered public interface, and thus neither used when linking to the openbabel library within openbabel itself, nor exposed in the cmake config file with the openbabel targets. Fixes openbabel#2305.
Set the include directories as public include interfaces of the openbabel library: this way they will be written in the cmake config file with the openbabel targets, and thus used when using the "openbabel" imported library.
Switch the OpenBabel3_INCLUDE_DIRS & OpenBabel3_LIBRARIES variables of the cmake config file to use the imported "openbabel" library: using that library alone is enough to get the include directories and the right library path; e.g.: target_link_library(mytarget openbabel)
Stop telling people to write their cmake find module, it is not useful with the provided cmake configuration files.
|
Thanks. Considering I have to go through CMake documentation anytime I have to fix some of this, it's greatly appreciated. And I agree it's probably time to move to 3.1 or later. |
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.
Use the modern CMake macros to produce config files that properly work (hopefully). This also makes it possible to deprecate the
OpenBabel3_INCLUDE_DIRS&OpenBabel3_LIBRARIESpublic CMake variables, and use only theopenbabelimported library.This fixes #2264.
This fixes #2305.