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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ceaac0..0ce9843 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,11 @@
+# ---------------------------------
+#
+# Unless you are an experimented cmake user,
+# have a look at :
+# http://www.creatis.insa-lyon.fr/site/fr/CreatoosGettingStarted-v2.0.X
+# before starting
+# ---------------------------------
+
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 PROJECT(crea)
 
@@ -5,17 +13,19 @@ INCLUDE(Version.cmake)
 SET(CREA_VERBOSE_CMAKE TRUE)
 SET(CREA_CMAKE_REL_PATH cmake)
 SET(CREA_CMAKE_DIR ${PROJECT_SOURCE_DIR}/${CREA_CMAKE_REL_PATH})
-INCLUDE(${CREA_CMAKE_DIR}/CREACMakeSettings.cmake)
+INCLUDE(${CREA_CMAKE_DIR}/CREACMakeSettings.cmake NO_POLICY_SCOPE)
 INCLUDE(${CREA_CMAKE_DIR}/CREAMacros.cmake)
 
+
 CREA_PREVENT_IN_SOURCE_BUILD()
 
+SET(USE_BOOST ON)
+
 OPTION(CREA_BUILD_VTK "Build crea with vtk ?" OFF)
 IF(CREA_BUILD_VTK)
   SET(USE_VTK ON)
   SET(CREA_BUILT_WITH_VTK ON)
 ENDIF(CREA_BUILD_VTK)
-SET(USE_BOOST ON)
 
 OPTION(CREA_BUILD_WX "Build crea with wxWidgets ?" OFF)
 IF(CREA_BUILD_WX)
@@ -30,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)
 
 
@@ -42,7 +61,8 @@ MARK_AS_ADVANCED(
   )
 #-----------------------------------------------------------------------------
 # messages compilation options 
-OPTION ( CREA_COMPILE_DEBUG_MESSAGES   "Compile CREA debug messages ?"   OFF)
+
+OPTION ( CREA_COMPILE_DEBUG_MESSAGES   "Compile CREA debug messages ?"   USE_DEBUG_LIB)
 OPTION ( CREA_COMPILE_ERROR_MESSAGES   "Compile CREA error messages ?"   ON)
 OPTION ( CREA_COMPILE_MESSAGES         "Compile CREA messages ?"         ON)
 OPTION ( CREA_COMPILE_WARNING_MESSAGES "Compile CREA warning messages ?" ON)
@@ -50,19 +70,19 @@ OPTION ( CREA_COMPILE_WARNING_MESSAGES "Compile CREA warning messages ?" ON)
 
 INCLUDE(${CREA_CMAKE_DIR}/CREAResolveOptions.cmake)
 
-SUBDIRS(cmake)
-SUBDIRS(src)
-SUBDIRS(appli)
-
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src)
 INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/src)
 
+ADD_SUBDIRECTORY(cmake)
+ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(appli)
+
 #-----------------------------------------------------------------------------
 OPTION( BUILD_SAMPLES "Build samples ?" OFF)
 IF(BUILD_SAMPLES)
-  SUBDIRS(samples)
+  ADD_SUBDIRECTORY(samples)
 ENDIF(BUILD_SAMPLES)
 #-----------------------------------------------------------------------------
 
-SUBDIRS(install)
+ADD_SUBDIRECTORY(install)