X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=a8c4e18d48a4d3cd5c7dbb4231f2e44dc0d7eeda;hb=b01d4d6368f5d29e2de4f4f101b5c4832a841dab;hp=8623c5cb54405aeac04090aa70ba7852260ae99e;hpb=caf70b171caba0cb8c1e4c00688b27844f93e31b;p=creaRigidRegistration.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 8623c5c..a8c4e18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,22 +2,29 @@ # # 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(CreaRecalage) +PROJECT(creaRigidRegistration) ################################### #================================== # The project version SET(PROJECT_MAJOR_VERSION 1) SET(PROJECT_MINOR_VERSION 0) -SET(PROJECT_BUILD_VERSION 0) +SET(PROJECT_BUILD_VERSION 1) #================================== #================================== @@ -29,6 +36,14 @@ 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() @@ -103,10 +118,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) #================================== #==================================