*** empty log message ***

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a492b4689da808390f0e89cb470acde3c45af17..0ce98436f85e1ba4b5f073eec66e71e24aac7838 100644 (file)
--- 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 2aa4263d066caa4b2033a5f9ae1c08f4d64b5458..96da5443e9b6dfd4ee6e607354b940de3158306a 100644 (file)
--- 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 1a4f02189df72ee286918018ecfaec576ae5d1e9..83b5c200acbd05e7bfd32ef48b33161a642db566 100644 (file)
--- 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 02204b1300256fae9a797903a716abd16f0cb1a3..a942cfb7be5943ef5a8829c92b9b79dc9872746b 100644 (file)
--- 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)