- new version

[creaRigidRegistration.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9613c21b20d509e7ce86f6e90bfdcb3c630341d..9949ae8a886a0ece155e73dc9d5f84c927b203b2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,13 +2,20 @@
 #
 # Unless you are an experimented cmake user,
 # have a look at :
-# http://www.creatis.insa-lyon.fr/creatools/GettingStarted_creaTools
+# http://www.creatis.insa-lyon.fr/site/fr/CreatoosGettingStarted-v2.0.X
 # before starting.
 #
 # ---------------------------------
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
+# 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(creaRigidRegistration)
 ###################################
@@ -17,9 +24,12 @@ PROJECT(creaRigidRegistration)
 # The project version
 SET(PROJECT_MAJOR_VERSION 1)
 SET(PROJECT_MINOR_VERSION 0)
-SET(PROJECT_BUILD_VERSION 0)
+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)
@@ -29,14 +39,6 @@ IF (crea_FOUND)
 ENDIF(crea_FOUND)
 #==================================
 
-#==================================
-# Find creaMaracasVisu (to use the lib)
-#FIND_PACKAGE(creaMaracasVisu REQUIRED)
-#IF (creaMaracasVisu_FOUND)
-  #INCLUDE(${creaMaracasVisu_USE_FILE})
-#ENDIF(creaMaracasVisu_FOUND)
-#==================================
-
 #==================================
 # Do not allow to build inside the source tree
 CREA_PREVENT_IN_SOURCE_BUILD()
@@ -73,6 +75,20 @@ SET(USE_TTH       OFF)
 CREA_FIND_AND_USE_LIBRARIES()
 #==================================
 
+
+
+#==================================
+# Find creaMaracasVisu (to use the lib)
+#FIND_PACKAGE(creaMaracasVisu REQUIRED)
+#IF (creaMaracasVisu_FOUND)
+  #INCLUDE(${creaMaracasVisu_USE_FILE})
+#ENDIF(creaMaracasVisu_FOUND)
+#==================================
+
+
+
+
+
 #==================================
 # Where to put executables and libs
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
@@ -111,10 +127,10 @@ SET(BBTK_DOC_BUILD_PATH
 #==================================
 
 # Subdirs
-SUBDIRS(lib)
-SUBDIRS(appli)
-SUBDIRS(doc)
-SUBDIRS(PackRecalage)
-SUBDIRS(install)
+ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(appli)
+ADD_SUBDIRECTORY(doc)
+ADD_SUBDIRECTORY(PackRecalage)
+ADD_SUBDIRECTORY(install)
 #==================================
 #==================================