Skip to content

Commit 2d470f9

Browse files
authored
Merge pull request #451 from SCOREC/apw/bob_libdir
Set bob install dir to CMAKE_INSTALL_LIBDIR
2 parents 88a39f6 + 7df25b3 commit 2d470f9

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

cmake/bob.cmake

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,11 @@ endmacro(bob_public_dep)
155155

156156
function(bob_export_target tgt_name)
157157
install(TARGETS ${tgt_name} EXPORT ${tgt_name}-target
158-
RUNTIME DESTINATION bin
159-
ARCHIVE DESTINATION lib
160-
LIBRARY DESTINATION lib)
158+
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
159+
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
160+
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
161161
install(EXPORT ${tgt_name}-target NAMESPACE ${PROJECT_NAME}::
162-
DESTINATION lib/cmake/${PROJECT_NAME})
162+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
163163
set(${PROJECT_NAME}_EXPORTED_TARGETS
164164
${${PROJECT_NAME}_EXPORTED_TARGETS} ${tgt_name} PARENT_SCOPE)
165165
endfunction(bob_export_target)
@@ -173,8 +173,8 @@ endmacro(bob_end_subdir)
173173

174174
function(bob_end_package)
175175
include(CMakePackageConfigHelpers)
176-
set(INCLUDE_INSTALL_DIR include)
177-
set(LIB_INSTALL_DIR lib)
176+
set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
177+
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
178178
set(CONFIG_CONTENT "
179179
set(${PROJECT_NAME}_VERSION ${${PROJECT_NAME}_VERSION})
180180
include(CMakeFindDependencyMacro)
@@ -213,7 +213,7 @@ set(${PROJECT_NAME}_CXX_FLAGS \"${CMAKE_CXX_FLAGS}\")
213213
")
214214
install(FILES
215215
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
216-
DESTINATION lib/cmake/${PROJECT_NAME})
216+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
217217
if(PROJECT_VERSION)
218218
file(WRITE
219219
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
@@ -224,6 +224,6 @@ set(${PROJECT_NAME}_CXX_FLAGS \"${CMAKE_CXX_FLAGS}\")
224224
COMPATIBILITY SameMajorVersion)
225225
install(FILES
226226
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
227-
DESTINATION lib/cmake/${PROJECT_NAME})
227+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
228228
endif()
229229
endfunction(bob_end_package)

0 commit comments

Comments
 (0)