From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Sat, 16 Oct 2010 18:35:56 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: Creatools2-0-3.bbtk0-9-5.17Feb2011~17
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=72e6ce35980bef087d93c8a2d2a687e5179f0f6c;p=bbtk.git

*** empty log message ***
---

diff --git a/kernel/cmake/BBTKConfigurePackagePaths.cmake b/kernel/cmake/BBTKConfigurePackagePaths.cmake
index 2ddfee1..e49161f 100644
--- a/kernel/cmake/BBTKConfigurePackagePaths.cmake
+++ b/kernel/cmake/BBTKConfigurePackagePaths.cmake
@@ -27,8 +27,20 @@ ELSE(WIN32)
 #  SET (EXECUTABLE_OUTPUT_REL_PATH bin) 
 #  SET (LIBRARY_OUTPUT_REL_PATH    bin)
   SET(BBTK_BIN_PATH ${BBTK_INSTALL_PREFIX}/bin)
-#EED  SET(BBTK_PACKAGE_LIB_PATH ${BBTK_INSTALL_PREFIX}/lib)
-      SET(BBTK_PACKAGE_LIB_PATH lib)
+
+	if( NOT APPLE )
+		# check 64 bit
+		if( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
+			set( HAVE_64_BIT 0 )
+			SET(BBTK_PACKAGE_LIB_PATH lib)
+		else( ${CMAKE_SIZEOF_VOID_P}EQUAL 4 )
+			set( HAVE_64_BIT 1 )
+			SET(BBTK_PACKAGE_LIB_PATH lib64)
+		endif( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
+	 endif( NOT APPLE )
+
+
+
   SET(BBTK_BBI "${BBTK_BIN_PATH}/bbi")
   SET(BBTK_BBS2CPP "${BBTK_BIN_PATH}/bbs2cpp")
   SET(BBTK_BBC "${BBTK_BIN_PATH}/bbc")
diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index 03eb509..d461929 100644
--- a/kernel/cmake/BBTKKernelConfig.cmake
+++ b/kernel/cmake/BBTKKernelConfig.cmake
@@ -61,7 +61,16 @@ IF(WIN32)
   SET(BBTK_BBFY ${BBTK_BIN_PATH}/bbfy.exe)
 
 ELSE(WIN32)
-  SET(BBTK_LIB_PATH lib)
+	if( NOT APPLE )
+		# check 64 bit
+		if( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
+			set( HAVE_64_BIT 0 )
+			SET(BBTK_LIB_PATH  lib)
+		else( ${CMAKE_SIZEOF_VOID_P}EQUAL 4 )
+			set( HAVE_64_BIT 1 )
+			SET(BBTK_LIB_PATH  lib64)
+		endif( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
+	 endif( NOT APPLE )
 # For Xcode : have to test the cmake generator !
   IF ( CMAKE_GENERATOR STREQUAL Xcode)
     SET(BBTK_BIN_PATH ${EXECUTABLE_OUTPUT_PATH}/Debug)
diff --git a/kernel/cmake/CMakeLists.txt b/kernel/cmake/CMakeLists.txt
index 3325774..26dc03c 100644
--- a/kernel/cmake/CMakeLists.txt
+++ b/kernel/cmake/CMakeLists.txt
@@ -14,7 +14,7 @@ FOREACH(file ${BBTK_CMAKE_FILES})
 ENDFOREACH(file ${BBTK_CMAKE_FILES})
 
  IF(UNIX)
-	SET(PREFIX lib/bbtk/)
+	SET(PREFIX ${BBTK_LIB_PATH}/bbtk/)
 ENDIF(UNIX)
 
 INSTALL(