- updated libdir patch

diff --git a/libdir.patch b/libdir.patch
index 2b05f8080708540a71efb981c313f6eb197c2c32..2b93c2b18db9ac1a2bf96f57c2b6a7375cac9d79 100644 (file)
--- a/libdir.patch
+++ b/libdir.patch
@@ -1,11 +1,22 @@
---- Eyescale-CMake-2016.04/common/Common.cmake~        2016-04-05 11:42:04.000000000 +0000
-+++ Eyescale-CMake-2016.04/common/Common.cmake 2016-05-28 16:40:47.577436434 +0000
-@@ -72,7 +72,7 @@
-     add_definitions(-fPIC)
-   endif()
- endif()
--set(LIBRARY_DIR lib)
-+set(LIBRARY_DIR lib${LIB_SUFFIX})
+--- 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)
  
- if(APPLE)
-   cmake_policy(SET CMP0042 NEW)
+ 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})