-new version

[creaEnvironment.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74a9fbe06d7bd7bf4aa08141a97794e257df1037..8f6ffedbfe7d7ef1ae9e79f70f4aca77fe1baa1a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,27 @@
 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 1)
+SET(PROJECT_BUILD_VERSION 2)
+
+#==================================
+
+# JPR 4 mars 2011
+set (CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Module)
 
+#==================================
+# Find crea (mandatory, to use macros)
 SET(CREA_VERBOSE_CMAKE TRUE)
 
 FIND_PACKAGE(crea REQUIRED)
@@ -34,6 +50,6 @@ MARK_AS_ADVANCED(
   )
 
 
-SUBDIRS(lib)
-SUBDIRS(install)
-#SUBDIRS(appli)
+ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(install)
+#ADD_SUBDIRECTORY(appli)