From: jean-pierre roux Date: Wed, 17 Mar 2010 11:14:20 +0000 (+0000) Subject: Add CMAKE_POLICY, to avoid tons of warnings X-Git-Tag: CREATOOLS.2-0-3~32 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=bebc8a85d32ec1ecad14913329a0fad6cedc758c;p=crea.git Add CMAKE_POLICY, to avoid tons of warnings --- diff --git a/appli/creaNewProject/NewProject/CMakeLists.txt.in b/appli/creaNewProject/NewProject/CMakeLists.txt.in index 31919f2..e572480 100644 --- a/appli/creaNewProject/NewProject/CMakeLists.txt.in +++ b/appli/creaNewProject/NewProject/CMakeLists.txt.in @@ -5,10 +5,21 @@ # http://www.creatis.insa-lyon.fr/site/fr/CreatoosGettingStarted-v2.0.X # before starting. # -# Generated with creaNewProject, version of : 03/03/2010 +# Generated with creaNewProject, version of : 12/03/2010 # --------------------------------- CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + +#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( PROJECT_NAME ) ################################### @@ -58,12 +69,12 @@ SET(USE_ITK OFF) SET(USE_BOOST OFF) # Note : Set USE_DOXYGEN to ON -# if you think you will ask, some day, +# if you think you will ask, some day, # for Doxygen generation SET(USE_DOXYGEN OFF) # Note : Set USE_LATEX to ON, USE_TTH to ON -# if you think you will ask, some day, +# if you think you will ask, some day, # for doc generation using your own latex documents SET(USE_LATEX OFF) SET(USE_TTH OFF) diff --git a/appli/creaNewProject/NewProject/appli/CMakeLists.txt b/appli/creaNewProject/NewProject/appli/CMakeLists.txt index 1f5bdfc..8a16d76 100644 --- a/appli/creaNewProject/NewProject/appli/CMakeLists.txt +++ b/appli/creaNewProject/NewProject/appli/CMakeLists.txt @@ -1,3 +1,3 @@ -# Add a SUBDIRS command for each of your applications +# Add a SUBDIRS command for each one of your applications # SUBDIRS(MyApp1) # SUBDIRS(MyApp2) diff --git a/appli/creaNewProject/NewProject/doc/README_HowToUpload.txt b/appli/creaNewProject/NewProject/doc/README_HowToUpload.txt index 0dcfc21..2b15cbd 100644 --- a/appli/creaNewProject/NewProject/doc/README_HowToUpload.txt +++ b/appli/creaNewProject/NewProject/doc/README_HowToUpload.txt @@ -2,4 +2,4 @@ After builing ALL : cd in the build tree cd share/doc -rsync -rtvO . tux:/var/www/html/software/public/creatools/bbtk/v0_9_0/ --perms --chmod=Dg+s,ug+w +rsync -rtvO . tux:/var/www/html/software/public/creatools/bbtk/v0_9_3/ --perms --chmod=Dg+s,ug+w diff --git a/appli/creaNewProject/NewProject/lib/CMakeLists.txt b/appli/creaNewProject/NewProject/lib/CMakeLists.txt index a9bd25b..bfbe22f 100644 --- a/appli/creaNewProject/NewProject/lib/CMakeLists.txt +++ b/appli/creaNewProject/NewProject/lib/CMakeLists.txt @@ -1,2 +1,2 @@ -# Add a SUBDIRS command for each of your libraries +# Add a SUBDIRS command for each one of your libraries # SUBDIRS(MyLib1) diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake index 0a9f2fa..48e6436 100644 --- a/cmake/CREAMacro_FindAndUseLibraries.cmake +++ b/cmake/CREAMacro_FindAndUseLibraries.cmake @@ -270,7 +270,7 @@ IF(USE_BOOST) MESSAGE ( STATUS "Looking for boost C++ library... - found in ${Boost_INCLUDE_DIR}") INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS} ) - + CREA_DEFINE( USE_BOOST ) IF(WIN32)