From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Sat, 16 Oct 2010 13:59:32 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: Creatools2-0-3.crea0-3-3.17Feb2011~20
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=632ee3795c38faf6ffa11ac0d0248851eb1aa12c;p=crea.git

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a492b4..0ce9843 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,16 @@ SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 IF (WIN32)
   SET(CREA_LIB_PATH bin)
 ELSE (WIN32)
-  SET(CREA_LIB_PATH lib)
+	if( NOT APPLE )
+		# check 64 bit
+		if( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
+			set( HAVE_64_BIT 0 )
+			SET(CREA_LIB_PATH lib)
+		else( ${CMAKE_SIZEOF_VOID_P}EQUAL 4 )
+			set( HAVE_64_BIT 1 )
+			SET(CREA_LIB_PATH lib64)
+		endif( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
+	 endif( NOT APPLE )
 ENDIF(WIN32)
 
 
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 2aa4263..96da544 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -13,7 +13,7 @@ FOREACH(file ${CREA_CMAKE_FILES})
 ENDFOREACH(file ${CREA_CMAKE_FILES})
 
 IF(UNIX)
-  SET(PREFIX lib/crea/)
+  SET(PREFIX ${CREA_LIB_PATH}/crea/)
 ENDIF(UNIX)
 
 INSTALL(
diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index 1a4f021..83b5c20 100644
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -1,7 +1,7 @@
 
 
 MACRO(CREA_FIND_AND_USE_LIBRARIES)
-#MESSAGE(ERROR "EED CREAMacrp_FindAndUseLibraries")
+
 IF(INCLUDE_CTEST)
 	include(CTEST) 
 ENDIF(INCLUDE_CTEST)
diff --git a/cmake/CREAMacro_InstallLibraryForCMake.cmake b/cmake/CREAMacro_InstallLibraryForCMake.cmake
index 02204b1..a942cfb 100644
--- a/cmake/CREAMacro_InstallLibraryForCMake.cmake
+++ b/cmake/CREAMacro_InstallLibraryForCMake.cmake
@@ -176,9 +176,11 @@ MACRO(CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE LIBRARY_NAME)
     SET(INSTALL_PATH .)
   ELSE(WIN32)
     IF(${LIBRARY_NAME}_INSTALL_FOLDER)
-      SET(INSTALL_PATH lib/${${LIBRARY_NAME}_INSTALL_FOLDER})
+##EED      SET(INSTALL_PATH lib/${${LIBRARY_NAME}_INSTALL_FOLDER})
+      SET(INSTALL_PATH ${${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS}/${${LIBRARY_NAME}_INSTALL_FOLDER})
     ELSE(${LIBRARY_NAME}_INSTALL_FOLDER)
-      SET(INSTALL_PATH lib/${LIBRARY_NAME})
+##EED      SET(INSTALL_PATH lib/${LIBRARY_NAME})
+	   SET(INSTALL_PATH ${${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS}/${LIBRARY_NAME})
     ENDIF(${LIBRARY_NAME}_INSTALL_FOLDER)
   ENDIF(WIN32)