Skip to content

Commit

Permalink
fix: don't hardcode library path
Browse files Browse the repository at this point in the history
Log:
  • Loading branch information
hillwoodroc authored and Groveer committed Jul 25, 2024
1 parent 75f7dcf commit f0968d9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -232,21 +232,21 @@ include(CMakePackageConfigHelpers)
configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/data/DDMConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/data/DDMConfig.cmake"
INSTALL_DESTINATION lib/cmake/DDM
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/DDM
PATH_VARS CMAKE_INSTALL_PREFIX
)

configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/data/AuthConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/data/AuthConfig.cmake"
INSTALL_DESTINATION lib/cmake/DDM
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}cmake/DDM
PATH_VARS CMAKE_INSTALL_PREFIX
)

configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/data/CommonConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/data/CommonConfig.cmake"
INSTALL_DESTINATION lib/cmake/DDM
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/DDM
PATH_VARS CMAKE_INSTALL_PREFIX
)

Expand All @@ -255,5 +255,5 @@ install(
"${CMAKE_CURRENT_BINARY_DIR}/data/DDMConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/data/AuthConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/data/CommonConfig.cmake"
DESTINATION lib/cmake/DDM
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/DDM
)
6 changes: 3 additions & 3 deletions src/auth/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ endif()
install(
TARGETS auth
EXPORT AuthTargets
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION bin
INCLUDES DESTINATION include/ddm/auth
)
Expand All @@ -59,5 +59,5 @@ install(FILES ${PUBLIC_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/ddm/aut
install(EXPORT AuthTargets
FILE AuthTargets.cmake
NAMESPACE DDM::
DESTINATION lib/cmake/DDM
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/DDM
)
6 changes: 3 additions & 3 deletions src/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ target_link_directories(common INTERFACE
install(
TARGETS common
EXPORT CommonTargets
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION bin
INCLUDES DESTINATION include/ddm/common
)
Expand All @@ -73,5 +73,5 @@ install(FILES ${PUBLIC_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/ddm/com
install(EXPORT CommonTargets
FILE CommonTargets.cmake
NAMESPACE DDM::
DESTINATION lib/cmake/DDM
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/DDM
)

0 comments on commit f0968d9

Please sign in to comment.