X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=0ce98436f85e1ba4b5f073eec66e71e24aac7838;hb=632ee3795c38faf6ffa11ac0d0248851eb1aa12c;hp=bd4e1eaf8bde3a539bf2c4dfb60a8dbd7ab23d9e;hpb=0693a70299d762305963a91af83759ec256e5549;p=crea.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd4e1ea..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)
 
 
@@ -61,13 +70,13 @@ OPTION ( CREA_COMPILE_WARNING_MESSAGES "Compile CREA warning messages ?" ON)
 
 INCLUDE(${CREA_CMAKE_DIR}/CREAResolveOptions.cmake)
 
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/src)
+
 ADD_SUBDIRECTORY(cmake)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(appli)
 
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src)
-INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/src)
-
 #-----------------------------------------------------------------------------
 OPTION( BUILD_SAMPLES "Build samples ?" OFF)
 IF(BUILD_SAMPLES)