Proposed fix for issue #1264 #1534
Closed
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
|
Thanks for the PR! |
vitaut
requested changes
Jan 25, 2020
vitaut
requested changes
Jan 25, 2020
CMakeLists.txt
Outdated
| string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER) | ||
| if(CMAKE_BUILD_TYPE STREQUAL "Debug") | ||
| get_target_property(_FMT_LIB_POSTFIX ${PROJECT_NAME_LOWER} DEBUG_POSTFIX) | ||
| set(FMT_LIB_NAME ${PROJECT_NAME_LOWER}${_FMT_LIB_POSTFIX}) |
There was a problem hiding this comment.
I suggest defining FMT_DEBUG_POSTFIX and using it here and to set target postfix in line 177 above instead of getting it from the properties.
There was a problem hiding this comment.
Like so?
set(FMT_DEBUG_POSTFIX d)
set_target_properties(fmt PROPERTIES
OUTPUT_NAME fmt
VERSION ${FMT_VERSION}
SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}
DEBUG_POSTFIX ${FMT_DEBUG_POSTFIX})
# Configure pkg-config fmt.pc properly
get_target_property(FMT_LIB_NAME fmt OUTPUT_NAME)
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(FMT_LIB_NAME ${FMT_LIB_NAME}${FMT_DEBUG_POSTFIX})
endif()
There was a problem hiding this comment.
Exactly. This simplifies the logic a bit.
|
Merged in 6c30f41, 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.
Fixes for issue:
#1264
I agree that my contributions are licensed under the {fmt} license, and agree to future changes to the licensing.