[clblas] 107/125: don't install in lib64 on mac

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository clblas.

commit d9fcbe49833666fcf3fc3ae3ea6365c6444f2fa6
Author: Gaëtan Lehmann <gaetan.lehmann at gmail.com>
Date:   Thu Mar 5 13:55:25 2015 +0100

    don't install in lib64 on mac
    
    things usually just go in lib
---
 src/CMakeLists.txt | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6043c01..867183c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -84,25 +84,14 @@ set( SUFFIX_BIN_DEFAULT "" )
 
 if(TARGET_PLATFORM EQUAL 32 OR TARGET_PLATFORM EQUAL 64)
     set(TARGET_PLATFORM ${TARGET_PLATFORM} CACHE STRING "Target platform type (32-bit or 64-bit)" FORCE)
-    if( TARGET_PLATFORM EQUAL 64 )
-        set( SUFFIX_LIB_DEFAULT "64" )
-    endif( )
 else()
     if(CMAKE_SIZEOF_VOID_P MATCHES 8)
         set(TARGET_PLATFORM "64" CACHE STRING "Target platform type (32-bit or 64-bit)" FORCE)
-        set( SUFFIX_LIB_DEFAULT "64" )
     else()
         set(TARGET_PLATFORM "32" CACHE STRING "Target platform type (32-bit or 64-bit)" FORCE)
     endif()
 endif()
 
-set( SUFFIX_LIB ${SUFFIX_LIB_DEFAULT} CACHE STRING "String to append to 'lib' install path" )
-set( SUFFIX_BIN ${SUFFIX_BIN_DEFAULT} CACHE STRING "String to append to 'bin' install path" )
-
-if( MSVC_IDE )
-    set_property( GLOBAL PROPERTY USE_FOLDERS TRUE )
-endif( )
-
 message(STATUS "Target platform: ${TARGET_PLATFORM}-bit")
 if(TARGET_PLATFORM EQUAL 32)
     set(_arch "x86" INTERNAL)
@@ -110,8 +99,18 @@ if(TARGET_PLATFORM EQUAL 32)
 else()
     set(_arch "x86_64" INTERNAL)
     set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
+    if( NOT APPLE )
+        set( SUFFIX_LIB_DEFAULT "64" )
+    endif( )
 endif()
 
+set( SUFFIX_LIB ${SUFFIX_LIB_DEFAULT} CACHE STRING "String to append to 'lib' install path" )
+set( SUFFIX_BIN ${SUFFIX_BIN_DEFAULT} CACHE STRING "String to append to 'bin' install path" )
+
+if( MSVC_IDE )
+    set_property( GLOBAL PROPERTY USE_FOLDERS TRUE )
+endif( )
+
 # add the math library for Linux
 if( UNIX ) 
     set(MATH_LIBRARY "m")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clblas.git