File 0003-Add-detection-of-lib-lib64-directory.patch of Package sfcgal

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-Add-detection-of-lib-lib64-directory.patch of Package sfcgal (Revision bfa6528f3531d95f6426ae648eaf8eab)

Currently displaying revision bfa6528f3531d95f6426ae648eaf8eab , Show latest

From 7715b9e8082d7967b3d910b7e754aa92856a7dbc Mon Sep 17 00:00:00 2001
From: Hugo Mercier <hugo.mercier@oslandia.com>
Date: Fri, 3 Jan 2014 09:20:16 +0100
Subject: [PATCH 3/7] Add detection of lib/lib64 directory

---
 CMakeLists.txt   | 30 ++++++++++++++++++++++++++++++
 sfcgal-config.in |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 831a13f..d0a4285 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -169,6 +169,36 @@ elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
 	endif()
 endif()
 
+
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+  set(_LIBDIR_DEFAULT "lib")
+  # Override this default 'lib' with 'lib64' iff:
+  #  - we are on Linux system but NOT cross-compiling
+  #  - we are NOT on debian
+  #  - we are on a 64 bits system
+  # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
+  # Note that the future of multi-arch handling may be even
+  # more complicated than that: http://wiki.debian.org/Multiarch
+  if(CMAKE_SYSTEM_NAME MATCHES "Linux"
+      AND NOT CMAKE_CROSSCOMPILING
+      AND NOT EXISTS "/etc/debian_version")
+    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
+      message(AUTHOR_WARNING
+        "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
+        "Please enable at least one language before including GNUInstallDirs.")
+    else()
+      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+        set(_LIBDIR_DEFAULT "lib64")
+      endif()
+    endif()
+  endif()
+  set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
+endif()
+
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+#SET(CMAKE_MACOSX_RPATH ON)
+
 #-- generate library headers
 configure_file( ${CMAKE_SOURCE_DIR}/include/SFCGAL/config.h.cmake ${CMAKE_SOURCE_DIR}/include/SFCGAL/config.h )
 configure_file( ${CMAKE_SOURCE_DIR}/include/SFCGAL/version.h.cmake ${CMAKE_SOURCE_DIR}/include/SFCGAL/version.h )
diff --git a/sfcgal-config.in b/sfcgal-config.in
index 4b5b170..a0e992c 100755
--- a/sfcgal-config.in
+++ b/sfcgal-config.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 prefix=@CMAKE_INSTALL_PREFIX@
-libdir=${prefix}/lib
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
 
 usage()
 {
-- 
1.8.4.5

Places

File 0003-Add-detection-of-lib-lib64-directory.patch of Package sfcgal (Revision bfa6528f3531d95f6426ae648eaf8eab)

Places