change SUBDIRS (deprecate functionality) to ADD_SUBDIRECTORY

[creaEnvironment.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7beb4d8ece488f1d62ce6502b0743b00afe9511..71756430dcee606fc7236477973296dd9c5dc0eb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,19 @@
-PROJECT(CreaEnvironment)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+
+#MARK_AS_ADVANCED( FORCE CMAKE_BACKWARDS_COMPATIBILITY )
+
+# for CMake 2.6 corrected behaviour (see "cmake --help-policy CMP0003")
+IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+  CMAKE_POLICY(SET CMP0003 NEW)
+  CMAKE_POLICY(SET CMP0005 NEW)  
+  CMAKE_POLICY(SET CMP0011 NEW)
+ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+
+PROJECT(creaEnvironment)
 
 SET(PROJECT_MAJOR_VERSION 1)
 SET(PROJECT_MINOR_VERSION 0)
-SET(PROJECT_BUILD_VERSION 0)
+SET(PROJECT_BUILD_VERSION 1)
 
 SET(CREA_VERBOSE_CMAKE TRUE)
 
@@ -13,6 +24,7 @@ ENDIF(crea_FOUND)
 
 CREA_PREVENT_IN_SOURCE_BUILD()
 
+SET(USE_CREA OFF)
 SET(USE_GDCM OFF)
 SET(USE_GDCM_VTK OFF)
 SET(USE_WXWIDGETS OFF)
@@ -31,5 +43,6 @@ MARK_AS_ADVANCED(
   )
 
 
-SUBDIRS(lib)
-#SUBDIRS(appli)
\ No newline at end of file
+ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(install)
+#ADD_SUBDIRECTORY(appli)