libdir.patch

   1 --- CMake-2016.12/Common.cmake~ 2016-12-05 15:54:16.000000000 +0100
   2 +++ CMake-2016.12/Common.cmake  2017-04-14 15:44:06.468738347 +0200
   3 @@ -37,8 +37,8 @@
   4  set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH FALSE)
   5
   6  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
   7 -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
   8 -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
   9 +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX})
  10 +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX})
  11  set(CMAKE_POSITION_INDEPENDENT_CODE ON)  # -fPIC
  12  set(CMAKE_INSTALL_MESSAGE LAZY) # no up-to-date messages on installation
  13  set(CMAKE_CXX_STANDARD_REQUIRED ON) # value of CXX_STANDARD on targets is required
  14 @@ -93,7 +93,7 @@
  15      set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ")
  16    endif()
  17    if(NOT CMAKE_INSTALL_NAME_DIR)
  18 -    set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
  19 +    set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
  20    endif()
  21    if(CMAKE_OSX_DEPLOYMENT_TARGET)
  22      set(COMMON_OSX_TARGET_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET})
  23 --- CMake-2016.12/CommonLibrary.cmake~  2016-12-05 15:54:16.000000000 +0100
  24 +++ CMake-2016.12/CommonLibrary.cmake   2017-04-14 16:00:11.264391317 +0200
  25 @@ -158,16 +158,16 @@
  26        # CommonPackageConfig.cmake
  27        if(${NAME}_OMIT_EXPORT)
  28          install(TARGETS ${LibName}
  29 -          ARCHIVE DESTINATION lib COMPONENT dev
  30 +          ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT dev
  31            RUNTIME DESTINATION bin COMPONENT lib
  32 -          LIBRARY DESTINATION lib COMPONENT lib
  33 +          LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT lib
  34            INCLUDES DESTINATION include)
  35        else()
  36          install(TARGETS ${LibName}
  37            EXPORT ${PROJECT_NAME}Targets
  38 -          ARCHIVE DESTINATION lib COMPONENT dev
  39 +          ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT dev
  40            RUNTIME DESTINATION bin COMPONENT lib
  41 -          LIBRARY DESTINATION lib COMPONENT lib
  42 +          LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT lib
  43            INCLUDES DESTINATION include)
  44        endif()
  45      endif()