File 0006-Fix-libmsym-libdir-for-64bit.patch of Package avogadro

Overview Repositories Revisions Requests Users Attributes Meta

File 0006-Fix-libmsym-libdir-for-64bit.patch of Package avogadro (Revision d767b7b6c67c0db93d3aac9e0eab4db6)

Currently displaying revision d767b7b6c67c0db93d3aac9e0eab4db6 , Show latest

From 3a2e3f5c7510c05abcf1149491b52dc6945806ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Wed, 27 Dec 2017 10:40:21 +0100
Subject: [PATCH 6/6] Fix libmsym libdir for 64bit

---
 libavogadro/src/extensions/symmetry/libmsym/CMakeLists.txt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/libavogadro/src/extensions/symmetry/libmsym/CMakeLists.txt b/libavogadro/src/extensions/symmetry/libmsym/CMakeLists.txt
index 653b4eddff21..bf7d3bb78a87 100644
--- a/libavogadro/src/extensions/symmetry/libmsym/CMakeLists.txt
+++ b/libavogadro/src/extensions/symmetry/libmsym/CMakeLists.txt
@@ -7,13 +7,19 @@ set(LIBMSYM_MINOR_VERSION 1)
 set(LIBMSYM_PATCH_VERSION 0)
 set(LIBMSYM_VERSION ${LIBMSYM_MAJOR_VERSION}.${LIBMSYM_MINOR_VERSION}.${LIBMSYM_PATCH_VERSION})
 
-set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for msym library")
+IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+  SET( LIB_SUFFIX "64" )
+ELSE(CMAKE_SIZEOF_VOID_P MATCHES "8")
+  SET( LIB_SUFFIX "" )
+ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8")
+              
+set(INSTALL_LIB_DIR lib${LIB_SUFFIX} CACHE PATH "Installation directory for msym library")
 set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
 
 if(WIN32 AND NOT CYGWIN)
   set(DEF_INSTALL_CMAKE_DIR CMake)
 else()
-  set(DEF_INSTALL_CMAKE_DIR lib/cmake/libmsym)
+  set(DEF_INSTALL_CMAKE_DIR lib${LIB_SUFFIX}/cmake/libmsym)
 endif()
 set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
 
-- 
2.15.1

Places

File 0006-Fix-libmsym-libdir-for-64bit.patch of Package avogadro (Revision d767b7b6c67c0db93d3aac9e0eab4db6)

Places