generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-02-23 15:14:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2171 from laserb/poco-1.9.0

Browse Source 
respect lib suffix when installing cmake files
This commit is contained in:
Günter Obiltschnig 2018-02-19 11:02:02 +01:00 committed by GitHub
commit 35a598f7c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -309,7 +309,7 @@ install(
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake
DESTINATION DESTINATION
"lib/cmake/${PROJECT_NAME}" "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}"
COMPONENT COMPONENT
Devel Devel
) )

6
cmake/PocoMacros.cmake
View File

@ -226,14 +226,14 @@ install(
EXPORT "${target_name}Targets" EXPORT "${target_name}Targets"
FILE "${PROJECT_NAME}${target_name}Targets.cmake" FILE "${PROJECT_NAME}${target_name}Targets.cmake"
NAMESPACE "${PROJECT_NAME}::" NAMESPACE "${PROJECT_NAME}::"
DESTINATION "lib/cmake/${PROJECT_NAME}" DESTINATION "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}"
) )
install( install(
FILES FILES
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Config.cmake" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Config.cmake"
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}ConfigVersion.cmake" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}ConfigVersion.cmake"
DESTINATION "lib/cmake/${PROJECT_NAME}" DESTINATION "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}"
COMPONENT Devel COMPONENT Devel
) )
@ -267,7 +267,7 @@ if (MSVC)
# install the targets pdb # install the targets pdb
POCO_INSTALL_PDB(${target_name}) POCO_INSTALL_PDB(${target_name})
endif() endif()
endmacro() endmacro()
# POCO_INSTALL_PDB - Install the given target's companion pdb file (if present) # POCO_INSTALL_PDB - Install the given target's companion pdb file (if present)