*** empty log message ***

[crea.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd6c35fef7c6eb9ff11354c537eaf213fc899997..0ce98436f85e1ba4b5f073eec66e71e24aac7838 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ SET(CREA_CMAKE_DIR ${PROJECT_SOURCE_DIR}/${CREA_CMAKE_REL_PATH})
 INCLUDE(${CREA_CMAKE_DIR}/CREACMakeSettings.cmake NO_POLICY_SCOPE)
 INCLUDE(${CREA_CMAKE_DIR}/CREAMacros.cmake)
 
+
 CREA_PREVENT_IN_SOURCE_BUILD()
 
 SET(USE_BOOST ON)
@@ -39,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)
 
 
@@ -60,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)