--- CMake-2016.12/Common.cmake~ 2016-12-05 15:54:16.000000000 +0100 +++ CMake-2016.12/Common.cmake 2017-04-14 15:44:06.468738347 +0200 @@ -37,8 +37,8 @@ set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH FALSE) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}) set(CMAKE_POSITION_INDEPENDENT_CODE ON) # -fPIC set(CMAKE_INSTALL_MESSAGE LAZY) # no up-to-date messages on installation set(CMAKE_CXX_STANDARD_REQUIRED ON) # value of CXX_STANDARD on targets is required @@ -93,7 +93,7 @@ set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ") endif() if(NOT CMAKE_INSTALL_NAME_DIR) - set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") + set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") endif() if(CMAKE_OSX_DEPLOYMENT_TARGET) set(COMMON_OSX_TARGET_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET}) --- CMake-2016.12/CommonLibrary.cmake~ 2016-12-05 15:54:16.000000000 +0100 +++ CMake-2016.12/CommonLibrary.cmake 2017-04-14 16:00:11.264391317 +0200 @@ -158,16 +158,16 @@ # CommonPackageConfig.cmake if(${NAME}_OMIT_EXPORT) install(TARGETS ${LibName} - ARCHIVE DESTINATION lib COMPONENT dev + ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT dev RUNTIME DESTINATION bin COMPONENT lib - LIBRARY DESTINATION lib COMPONENT lib + LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT lib INCLUDES DESTINATION include) else() install(TARGETS ${LibName} EXPORT ${PROJECT_NAME}Targets - ARCHIVE DESTINATION lib COMPONENT dev + ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT dev RUNTIME DESTINATION bin COMPONENT lib - LIBRARY DESTINATION lib COMPONENT lib + LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT lib INCLUDES DESTINATION include) endif() endif()