From: jean-pierre roux Date: Fri, 5 Nov 2010 18:46:33 +0000 (+0000) Subject: remove spurious MESSAGE X-Git-Tag: Creatools2-0-3.crea0-3-3.17Feb2011~7 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=db68308d623409dddde94c097966e60718f721eb;p=crea.git remove spurious MESSAGE --- diff --git a/CMakeLists.txt b/CMakeLists.txt index a7e68d6..1ec2323 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,6 @@ INCLUDE(${CREA_CMAKE_DIR}/CREAMacros.cmake) CREA_PREVENT_IN_SOURCE_BUILD() - SET(USE_BOOST ON) OPTION(CREA_BUILD_VTK "Build crea with vtk ?" OFF) @@ -40,7 +39,6 @@ IF(CREA_BUILD_WX) ENDIF(CREA_BUILD_WX) CREA_FIND_AND_USE_LIBRARIES() - SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}) SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}) SET(CREA_LIB_PATH ${CMAKE_CREA_LIB_PATH} ) @@ -67,7 +65,6 @@ INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/src) ADD_SUBDIRECTORY(cmake) ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(appli) - #----------------------------------------------------------------------------- OPTION( BUILD_SAMPLES "Build samples ?" OFF) IF(BUILD_SAMPLES) diff --git a/appli/creaNewProject/CMakeLists.txt b/appli/creaNewProject/CMakeLists.txt index c1bc93f..3e54024 100644 --- a/appli/creaNewProject/CMakeLists.txt +++ b/appli/creaNewProject/CMakeLists.txt @@ -87,7 +87,7 @@ ELSE(WIN32) # ${CMAKE_CURRENT_SOURCE_DIR}/NewProject/lib/template_lib/${PROJECT_NAME}System.h # @ONLY IMMEDIATE # ) - + CREA_MKDIR(${EXECUTABLE_OUTPUT_PATH}/share/creaNewProject) CREA_CPDIR(${INPUT_PROJECT_DIR} ${EXECUTABLE_OUTPUT_PATH}/share/creaNewProject) diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake index 09fa8b0..e678ebc 100644 --- a/cmake/CREAMacro_FindAndUseLibraries.cmake +++ b/cmake/CREAMacro_FindAndUseLibraries.cmake @@ -41,7 +41,7 @@ IF(USE_QT4) CREA_DEFINE( USE_QT ) # SET(QT_LIBRARIES - # ${QT_LIBRARIES} + # ${QT_LIBRARIES} # ) # MARK_AS_ADVANCED(Qt4_DIR) ENDIF(QT_FOUND) @@ -198,13 +198,13 @@ IF(USE_GDCM2) IF(USE_VTK) IF(WIN32) SET(GDCM_LIBRARIES - ${GDCM_LIBRARIES} + ${GDCM_LIBRARIES} vtkgdcm #gdcm2vtk ) ELSE(WIN32) SET(GDCM_LIBRARIES - ${GDCM_LIBRARIES} + ${GDCM_LIBRARIES} vtkgdcm ) ENDIF(WIN32) @@ -212,11 +212,8 @@ IF(USE_GDCM2) ENDIF(USE_VTK) ENDIF(USE_GDCM_VTK) - ENDIF(USE_GDCM2) - - #----------------------------------------------------------------------------- #----------------------------------------------------------------------------- @@ -279,19 +276,14 @@ ENDIF(USE_TTH) #----------------------------------------------------------------------------- #----------------------------------------------------------------------------- IF(USE_BOOST) -message(STATUS "1") IF(NOT Boost_FOUND) FIND_PACKAGE(Boost COMPONENTS filesystem signals date_time regex REQUIRED) IF(Boost_FOUND) - message(STATUS "1 bis") MESSAGE ( STATUS "=======================================") MESSAGE ( STATUS "Looking for boost C++ library... - found in ${Boost_INCLUDE_DIR}") INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS}) IF(WIN32) - message("creamacro find and use lib = ${Boost_LIBRARIES}") - - CREA_DEFINE( USE_BOOST ) SET(BOOST_LIBRARIES @@ -332,11 +324,9 @@ message(STATUS "1") MARK_AS_ADVANCED(Boost_LIBRARY_DIRS) ELSE(Boost_FOUND) - message(STATUS "2") - MESSAGE( "boost C++ library not found - Set Boost_INCLUDE_DIR to the directory containing boost headers") + MESSAGE( STATUS "boost C++ library not found - Set Boost_INCLUDE_DIR to the directory containing boost headers") ENDIF(Boost_FOUND) ENDIF(NOT Boost_FOUND) - message("${Boost_FOUND}") ENDIF(USE_BOOST)