scottk/wlan-cloud-lib-poco
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-lib-poco.git synced 2025-10-29 17:52:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

respect lib suffix when installing cmake files

Browse Source 
Some cmake files contain pathes to the lib directory with suffix.
So they should respect the suffix as well.
This commit is contained in:
Raphael Freudiger
2018-02-14 15:13:46 +01:00
parent d993fb09b7
commit 1dc38d8500
2 changed files with 4 additions and 4 deletions
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}ConfigVersion.cmake
DESTINATION
"lib/cmake/${PROJECT_NAME}"
"lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}"
COMPONENT
Devel
)

6
cmake/PocoMacros.cmake
View File

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