Support custom FMT_INC_DIR in pkgconfig and cmake configs #1702
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
When CMAKE_INSTALL_INCLUDEDIR or FMT_INC_DIR override the header
installation directory, they should be used instead of
${CMAKE_INSTALL_PREFIX}/include in fmt-targets.cmake and fmt.pc.
orivej
commented
May 26, 2020
| @@ -197,8 +197,7 @@ endif () | |||
| target_compile_features(fmt INTERFACE ${FMT_REQUIRED_FEATURES}) | |||
|
|
|||
| target_include_directories(fmt PUBLIC | |||
| $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> | |||
| $<INSTALL_INTERFACE:include>) | |||
There was a problem hiding this comment.
include install interface is equivalent to ${CMAKE_INSTALL_PREFIX}/include.
There was a problem hiding this comment.
I suggest updating INSTALL_INTERFACE:include here instead of splitting target_include_directories into two.
| set (INSTALL_TARGETS fmt) | ||
| if (TARGET fmt-header-only) | ||
| set(INSTALL_TARGETS ${INSTALL_TARGETS} fmt-header-only) | ||
| endif () |
There was a problem hiding this comment.
fmt-header-only has been always enabled since 691a7a9.
10 tasks
vitaut
requested changes
May 27, 2020
| @@ -197,8 +197,7 @@ endif () | |||
| target_compile_features(fmt INTERFACE ${FMT_REQUIRED_FEATURES}) | |||
|
|
|||
| target_include_directories(fmt PUBLIC | |||
| $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> | |||
| $<INSTALL_INTERFACE:include>) | |||
There was a problem hiding this comment.
I suggest updating INSTALL_INTERFACE:include here instead of splitting target_include_directories into two.
| @@ -232,8 +231,7 @@ target_compile_definitions(fmt-header-only INTERFACE FMT_HEADER_ONLY=1) | |||
| target_compile_features(fmt-header-only INTERFACE ${FMT_REQUIRED_FEATURES}) | |||
|
|
|||
| target_include_directories(fmt-header-only INTERFACE | |||
| $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> | |||
| $<INSTALL_INTERFACE:include>) | |||
| set (INSTALL_TARGETS fmt) | ||
| if (TARGET fmt-header-only) | ||
| set(INSTALL_TARGETS ${INSTALL_TARGETS} fmt-header-only) | ||
| endif () |
CMakeLists.txt
Outdated
| @@ -264,14 +257,22 @@ if (FMT_INSTALL) | |||
| "Installation directory for pkgconfig (.pc) files, a relative path " | |||
| "that will be joined to ${CMAKE_INSTALL_PREFIX}, or an arbitrary absolute path.") | |||
|
|
|||
| get_filename_component(FMT_INC_DIR_PARENT "${FMT_INC_DIR}" DIRECTORY) | |||
There was a problem hiding this comment.
I think we should remove /fmt from FMT_INC_DIR for consistency with FMT_LIB_DIR and CMAKE_INSTALL_INCLUDEDIR.
This makes FMT_INC_DIR an alias for CMAKE_INSTALL_INCLUDEDIR and simplifies generation of pkgconfig and cmake configs.
|
Done. |
|
Thanks! |
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.
When
CMAKE_INSTALL_INCLUDEDIRorFMT_INC_DIRoverride the header installation directory, they should be used instead of${CMAKE_INSTALL_PREFIX}/includeinfmt-targets.cmakeandfmt.pc.