TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-18 00:40:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: install libraries to CMAKE_INSTALL_LIBDIR (fixes gh #240)

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2024-10-18 14:23:07 +02:00
parent afbd85e4b1
commit ca69d2b141
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.docker/build-linux.sh
View File

@ -191,7 +191,7 @@ if [[ "$BUILD_FROM_TARBALL" == "1" ]]; then
rm -rf "$INSTALLDIR" rm -rf "$INSTALLDIR"
if [[ "-$BUILD_TYPE-" == *-shared-* ]]; then if [[ "-$BUILD_TYPE-" == *-shared-* ]]; then
LDLIBPATH="$PREFIXPATH/lib" LDLIBPATH="$(readlink -m "$PREFIXPATH/lib/$(gcc -print-multi-os-directory)")"
if [[ ":$LD_LIBRARY_PATH:" != *":$LDLIBPATH:"* ]]; then if [[ ":$LD_LIBRARY_PATH:" != *":$LDLIBPATH:"* ]]; then
export "LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}$LDLIBPATH" export "LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}$LDLIBPATH"
fi fi

10
cmake/libdwarfs.cmake
View File

@ -279,12 +279,12 @@ if(NOT STATIC_BUILD_DO_NOT_USE)
${RICEPP_OBJECT_TARGETS} ${RICEPP_OBJECT_TARGETS}
folly_deps folly_deps
EXPORT dwarfs-targets EXPORT dwarfs-targets
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION lib) ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
install( install(
DIRECTORY include/dwarfs DIRECTORY include/dwarfs
DESTINATION include DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
PATTERN include/dwarfs/internal EXCLUDE PATTERN include/dwarfs/internal EXCLUDE
PATTERN include/dwarfs/tool EXCLUDE PATTERN include/dwarfs/tool EXCLUDE
PATTERN include/dwarfs/*/internal EXCLUDE PATTERN include/dwarfs/*/internal EXCLUDE
@ -293,13 +293,13 @@ if(NOT STATIC_BUILD_DO_NOT_USE)
if(DWARFS_GIT_BUILD) if(DWARFS_GIT_BUILD)
install( install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/include/dwarfs/version.h FILES ${CMAKE_CURRENT_BINARY_DIR}/include/dwarfs/version.h
DESTINATION include/dwarfs DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dwarfs
) )
endif() endif()
install( install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/include/dwarfs/config.h FILES ${CMAKE_CURRENT_BINARY_DIR}/include/dwarfs/config.h
DESTINATION include/dwarfs DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dwarfs
) )
install( install(