Use GNUInstallDirs for mapping installation directories (continued) #1397
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
78b3fde to
11e9cb0
Compare
|
Thank you for your patch. It’d be great, if you could write a little more elaborate commit messages, as some people might lack the CMake knowledge. |
- Don't destroy cmake file between test case invocations
CMake config files don't need any logic to detect the location of installed headers or DSOs, because these locations are already determined at project configuration time. They also don't need to distinguish between build and install trees, because that is already handled by the generated `LibeventTargets-*.cmake` files.
azat
approved these changes
May 14, 2023
This was referenced May 14, 2023
azat
reviewed
May 14, 2023
| @@ -13,8 +13,8 @@ endmacro() | |||
| macro(generate_pkgconfig LIB_NAME) | |||
| set(prefix ${CMAKE_INSTALL_PREFIX}) | |||
| set(exec_prefix ${CMAKE_INSTALL_PREFIX}) | |||
| set(libdir ${CMAKE_INSTALL_PREFIX}/lib) | |||
| set(includedir ${CMAKE_INSTALL_PREFIX}/include) | |||
| set(libdir ${CMAKE_INSTALL_LIBDIR}) | |||
There was a problem hiding this comment.
Likely here ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} should be used. I will fix this.
There was a problem hiding this comment.
You might want to use ${CMAKE_INSTALL_FULL_LIBDIR} instead.
There was a problem hiding this comment.
Didn't know about this, thanks, will try
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.
Continuation of #1221.
The last commit updates
LibeventConfig.cmaketo always getLIBEVENT_INSTALL_DIR(S)from theevent::coretarget.I took the liberty to fix the guard against multiple target definitions (although I believe it would be better to just remove it).