*** empty log message ***

diff --git a/kernel/cmake/BBTKConfigurePackagePaths.cmake b/kernel/cmake/BBTKConfigurePackagePaths.cmake
index 2ddfee14c94986b9c3bebf20e70e8658a6ed930a..e49161f0f1c5496c24dc36b6cc4757fc6e1f82b7 100644 (file)
--- 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 03eb509ef073ed6fac280cb61c483854c16ae7f8..d461929f74693997c7db3f48b51f888f4c150f29 100644 (file)
--- 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 3325774ee0ab53966bcddc4b9a5d3b8cfc23733b..26dc03c178343775d47b31041f20b6717a9be80a 100644 (file)
--- 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(