]> Creatis software - crea.git/commitdiff
*** empty log message ***
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Mon, 18 Oct 2010 08:34:25 +0000 (08:34 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Mon, 18 Oct 2010 08:34:25 +0000 (08:34 +0000)
CMakeLists.txt
cmake/CREAMacro_Define.cmake

index 0ce98436f85e1ba4b5f073eec66e71e24aac7838..90b53c5d6bfb1461591608c5061f02017380ea03 100644 (file)
@@ -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
index dadcab37ffa6735fa274fb6b53c91db5431fdc28..b88e0382d25e6c822303a8cc459b50d612eddec0 100644 (file)
@@ -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)
 #-----------------------------------------------------------------------------