From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Mon, 18 Oct 2010 08:34:25 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: Creatools2-0-3.crea0-3-3.17Feb2011~18
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1057f33d76778c17f08a9db64bb377178e54c4fa;p=crea.git

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ce9843..90b53c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,22 +37,7 @@ CREA_FIND_AND_USE_LIBRARIES()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
-IF (WIN32)
-  SET(CREA_LIB_PATH bin)
-ELSE (WIN32)
-	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)
-
-
+SET(CREA_LIB_PATH ${CMAKE_CREA_LIB_PATH} )
 
 MARK_AS_ADVANCED(
   CMAKE_BACKWARDS_COMPATIBILITY
diff --git a/cmake/CREAMacro_Define.cmake b/cmake/CREAMacro_Define.cmake
index dadcab3..b88e038 100644
--- a/cmake/CREAMacro_Define.cmake
+++ b/cmake/CREAMacro_Define.cmake
@@ -48,6 +48,24 @@ MACRO(CREA_DEFINE_OPERATING_SYSTEM )
       ENDIF(WIN32)
     ENDIF("${CMAKE_SYSTEM}" MATCHES "Linux")
   ENDIF(APPLE) 
+
+
+  IF (WIN32)
+    SET(CMAKE_CREA_LIB_PATH bin)
+  ELSE (WIN32)
+    if( NOT APPLE )
+      # check 64 bit
+      if( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
+	 set( HAVE_64_BIT 0 )
+	 SET(CMAKE_CREA_LIB_PATH lib)
+      else( ${CMAKE_SIZEOF_VOID_P}EQUAL 4 )
+	 set( HAVE_64_BIT 1 )
+	 SET(CMAKE_CREA_LIB_PATH lib64)
+      endif( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
+    endif( NOT APPLE )
+  ENDIF(WIN32)
+
+
 ENDMACRO(CREA_DEFINE_OPERATING_SYSTEM)
 #-----------------------------------------------------------------------------