Fully embrace GNUInstallDirs #42
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
AnyOldName3
reviewed
Jan 27, 2026
Member
|
Are you expecting any of the paths to end up different for platforms that aren't explicitly making them different by customising |
Author
Not at all, except for WIN32's LIBDIR=bin config, that's why this extra handling needs to stay - when we look at the main section determining these install paths for osg-openmw so far, we see this correlating with -SET(INSTALL_INCDIR include)
-SET(INSTALL_BINDIR bin)
-IF(WIN32)
- SET(INSTALL_LIBDIR bin)
- SET(INSTALL_ARCHIVEDIR lib)
-ELSE()
- SET(INSTALL_LIBDIR lib${LIB_POSTFIX})
- SET(INSTALL_ARCHIVEDIR lib${LIB_POSTFIX})
-ENDIF()
|
a17r
force-pushed
the
gnuinstalldirs
branch
2 times, most recently
from
caf9254 to
a64ae23
Compare
a17r
commented
Jan 27, 2026
Comment on lines
-51
to
+49
| LIBRARY DESTINATION lib COMPONENT libopenthreads | ||
| RUNTIME DESTINATION ${INSTALL_BINDIR} COMPONENT libopenthreads | ||
| RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libopenthreads | ||
| LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libopenthreads |
Author
There was a problem hiding this comment.
Please note this was already deviating from elsewhere in osg where LIBRARY DESTINATION for WIN32 is bin instead of lib, so I kept it that way.
- Consolidate the use of different variables for bin, lib and include
- Keep ${exec_prefix}/ in pkgconfig, deriving relative paths from std vars
- Use CMAKE_INSTALL_FULL_* where absolute paths are expected
- Ensure GNUInstallDirs is included early in the project
- For WIN32, keep the existing bin installdir for libraries
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
AnyOldName3
approved these changes
Jan 28, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
There may be a few occasions of bin/lib in WIN32 branches that I missed yet, and the CMake
<3.20fallback is a bit crude still.