From 8733d3f1f61f6e3fb778178655c81b865205402f Mon Sep 17 00:00:00 2001 From: guigues Date: Tue, 13 Jan 2009 09:50:22 +0000 Subject: [PATCH] *** empty log message *** --- AdditionalcreaConfig.cmake.in | 40 ++++++------- appli/creaNewProject/CMakeLists.txt | 3 +- .../NewProject/CMakeLists.txt.in | 57 ++++++++++++------- .../NewProject/appli/CMakeLists.txt | 4 +- .../appli/template_appli/CMakeLists.txt | 7 ++- .../appli/template_wx_appli/CMakeLists.txt | 40 ------------- .../NewProject/lib/CMakeLists.txt | 2 +- appli/creaSed/creaSed.cpp | 31 +++++----- cmake/CREAMacro_FindAndUseLibraries.cmake | 18 +++++- 9 files changed, 99 insertions(+), 103 deletions(-) delete mode 100644 appli/creaNewProject/NewProject/appli/template_wx_appli/CMakeLists.txt diff --git a/AdditionalcreaConfig.cmake.in b/AdditionalcreaConfig.cmake.in index 07bae21..56d9c88 100644 --- a/AdditionalcreaConfig.cmake.in +++ b/AdditionalcreaConfig.cmake.in @@ -22,25 +22,25 @@ IF(CREA_VERBOSE_CMAKE) ENDIF(CREA_VERBOSE_CMAKE) #----------------------------------------------------------------------------- -# If crea was compiled with WxWidget or vtk then have to find them -IF(CREA_BUILT_WITH_WX OR CREA_BUILT_WITH_VTK) - INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_Define.cmake) -ENDIF(CREA_BUILT_WITH_WX OR CREA_BUILT_WITH_VTK) -IF(CREA_BUILT_WITH_WX) - IF(NOT wxWidgets_FOUND) - MESSAGE(STATUS "=======================================") - MESSAGE(STATUS "crea was built with wxWidgets: have to find it...") - INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseWxWidgets.cmake) - CREA_FIND_AND_USE_WXWIDGETS() - ENDIF(NOT wxWidgets_FOUND) -ENDIF(CREA_BUILT_WITH_WX) -IF(CREA_BUILT_WITH_VTK) - IF (NOT VTK_FOUND) - MESSAGE(STATUS "=======================================") - MESSAGE(STATUS "crea was built with VTK: have to find it...") - INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseVTK.cmake) - CREA_FIND_AND_USE_VTK() - ENDIF (NOT VTK_FOUND) -ENDIF(CREA_BUILT_WITH_VTK) +# If crea was compiled with WxWidget or vtk then have to find them +#IF(CREA_BUILT_WITH_WX OR CREA_BUILT_WITH_VTK) +# INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_Define.cmake) +#ENDIF(CREA_BUILT_WITH_WX OR CREA_BUILT_WITH_VTK) +#IF(CREA_BUILT_WITH_WX) +# IF(NOT wxWidgets_FOUND) +# MESSAGE(STATUS "=======================================") +# MESSAGE(STATUS "crea was built with wxWidgets: have to find it...") +# INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseWxWidgets.cmake) +# CREA_FIND_AND_USE_WXWIDGETS() +# ENDIF(NOT wxWidgets_FOUND) +#ENDIF(CREA_BUILT_WITH_WX) +#IF(CREA_BUILT_WITH_VTK) +# IF (NOT VTK_FOUND) +# MESSAGE(STATUS "=======================================") +# MESSAGE(STATUS "crea was built with VTK: have to find it...") +# INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseVTK.cmake) +# CREA_FIND_AND_USE_VTK() +# ENDIF (NOT VTK_FOUND) +#ENDIF(CREA_BUILT_WITH_VTK) diff --git a/appli/creaNewProject/CMakeLists.txt b/appli/creaNewProject/CMakeLists.txt index 4682555..f8e6484 100644 --- a/appli/creaNewProject/CMakeLists.txt +++ b/appli/creaNewProject/CMakeLists.txt @@ -4,10 +4,11 @@ SET(EXE_NAME creaNewProject) SET(${EXE_NAME}_SOURCES creaNewProject.cpp) +SET(${EXE_NAME}_HAS_GUI TRUE) SET(${EXE_NAME}_CONSOLE FALSE) SET(${EXE_NAME}_LINK_LIBRARIES crea) -CREA_ADD_WX_EXECUTABLE( ${EXE_NAME} ) +CREA_ADD_EXECUTABLE( ${EXE_NAME} ) #============================================================================ diff --git a/appli/creaNewProject/NewProject/CMakeLists.txt.in b/appli/creaNewProject/NewProject/CMakeLists.txt.in index f86e7b5..ecd080e 100644 --- a/appli/creaNewProject/NewProject/CMakeLists.txt.in +++ b/appli/creaNewProject/NewProject/CMakeLists.txt.in @@ -1,46 +1,63 @@ -# -# Test CMake version -# -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) -ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4) +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +################################### PROJECT(PROJECT_NAME) +################################### +#================================== +# The project version SET(PROJECT_MAJOR_VERSION 1) SET(PROJECT_MINOR_VERSION 0) SET(PROJECT_BUILD_VERSION 0) +#================================== +#================================== +# Find crea SET(CREA_VERBOSE_CMAKE TRUE) - FIND_PACKAGE(crea REQUIRED) IF (crea_FOUND) INCLUDE(${crea_USE_FILE}) ENDIF(crea_FOUND) +#================================== +#================================== +# Do not allow to build inside the source tree CREA_PREVENT_IN_SOURCE_BUILD() - -SET(USE_GDCM OFF) -SET(USE_GDCM_VTK OFF) +#================================== + +#================================== +# Libraries/tools used +# Note : Set USE_CREA to ON +# if you need to LINK against crea +# (and not only use its macros) +SET(USE_CREA OFF) +SET(USE_GDCM OFF) +SET(USE_GDCM_VTK OFF) +SET(USE_GDCM2 OFF) SET(USE_WXWIDGETS OFF) -SET(USE_VTK OFF) -SET(USE_ITK OFF) -SET(USE_BOOST OFF) - +SET(USE_KWWIDGETS OFF) +SET(USE_VTK OFF) +SET(USE_ITK OFF) +SET(USE_BOOST OFF) +SET(USE_DOXYGEN OFF) +SET(USE_LATEX OFF) +SET(USE_TTH OFF) CREA_FIND_AND_USE_LIBRARIES() +#================================== +#================================== +# Where to put executables and libs SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}) SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}) MARK_AS_ADVANCED( CMAKE_BACKWARDS_COMPATIBILITY - EXECUTABLE_OUTPUT_PATH + EXECUTABLE_OUTPUT_PATH LIBRARY_OUTPUT_PATH ) +#================================== +#================================== +# Subdirs SUBDIRS(appli) SUBDIRS(lib) +#================================== diff --git a/appli/creaNewProject/NewProject/appli/CMakeLists.txt b/appli/creaNewProject/NewProject/appli/CMakeLists.txt index 32618d6..1f5bdfc 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 -# SUBDIRS(myapp1) -# SUBDIRS(myapp2) +# SUBDIRS(MyApp1) +# SUBDIRS(MyApp2) diff --git a/appli/creaNewProject/NewProject/appli/template_appli/CMakeLists.txt b/appli/creaNewProject/NewProject/appli/template_appli/CMakeLists.txt index 3b02804..abff49e 100644 --- a/appli/creaNewProject/NewProject/appli/template_appli/CMakeLists.txt +++ b/appli/creaNewProject/NewProject/appli/template_appli/CMakeLists.txt @@ -16,8 +16,9 @@ FILE(GLOB ${EXE_NAME}_SOURCES *.cxx *.cpp *.cc) #---------------------------------------------------------------------------- # DEPENDENCIES (LIBRARIES TO LINK WITH) SET ( ${EXE_NAME}_LINK_LIBRARIES - ${crea_LIBRARIES} + # ${crea_LIBRARIES} # ${WXWIDGETS_LIBRARIES} + # ${KWWidgets_LIBRARIES} # ${VTK_LIBRARIES} # ${ITK_LIBRARIES} # ${GDCM_LIBRARIES} @@ -27,6 +28,10 @@ SET ( ${EXE_NAME}_LINK_LIBRARIES #---------------------------------------------------------------------------- # CREATES AND INSTALLS THE EXE +# Set to ON if your appli has a GUI (to build as a Win32 app on windows) +SET(${EXE_NAME}_HAS_GUI OFF) +# Set to ON if your appli has a GUI but you also want a msdos console on windows +SET(${EXE_NAME}_CONSOLE OFF) CREA_ADD_EXECUTABLE( ${EXE_NAME} ) #---------------------------------------------------------------------------- diff --git a/appli/creaNewProject/NewProject/appli/template_wx_appli/CMakeLists.txt b/appli/creaNewProject/NewProject/appli/template_wx_appli/CMakeLists.txt deleted file mode 100644 index fd728c2..0000000 --- a/appli/creaNewProject/NewProject/appli/template_wx_appli/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -#---------------------------------------------------------------------------- -# SET THE NAME OF YOUR EXECUTABLE -SET ( EXE_NAME MyExe ) -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# EXECUTABLE SOURCES (TO BE COMPILED) -# EITHER LIST ALL .cxx, *.cpp, *.cc IN CURRENT DIR USING NEXT LINE: -FILE(GLOB ${EXE_NAME}_SOURCES *.cxx *.cpp *.cc) -# OR MANUALLY LIST YOUR FILES WITH NEXT COMMAND (WITHOUT EXTENSION) -# SET ( ${EXE_NAME}_SOURCES -# -# ) -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# DEPENDENCIES (LIBRARIES TO LINK WITH) -SET ( ${EXE_NAME}_LINK_LIBRARIES - ${crea_LIBRARIES} - # ${WXWIDGETS_LIBRARIES} - # ${VTK_LIBRARIES} - # ${ITK_LIBRARIES} - # ${GDCM_LIBRARIES} - # ${BOOST_LIBRARIES} - ) -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# UNCOMMENT NEXT LINE IF YOU WANT A CONSOLE ON WINDOWS -# NB : YOUR MAIN MUST BE ADAPTED ALSO -# SEE THE MACRO CREA_WXMAIN_WITH_CONSOLE IN creaWx.h -#SET(${EXE_NAME}_CONSOLE TRUE) -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# CREATES AND INSTALLS THE EXE -CREA_ADD_WX_EXECUTABLE( ${EXE_NAME} ) -#---------------------------------------------------------------------------- - - diff --git a/appli/creaNewProject/NewProject/lib/CMakeLists.txt b/appli/creaNewProject/NewProject/lib/CMakeLists.txt index 8fc9678..a9bd25b 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 -# SUBDIRS(template_lib) +# SUBDIRS(MyLib1) diff --git a/appli/creaSed/creaSed.cpp b/appli/creaSed/creaSed.cpp index 51ca114..288c10d 100644 --- a/appli/creaSed/creaSed.cpp +++ b/appli/creaSed/creaSed.cpp @@ -1,5 +1,4 @@ -#include #include #include #include @@ -7,21 +6,19 @@ #include - - void replace( std::string& str, - const std::string& from, - const std::string& to ) - { - using std::string; - string::size_type pos = str.find( from ); - while ( pos != string::npos ) - { - str.replace( pos, from.size(), to ); - pos = str.find( from, pos+from.size()-1 ); - } - } - - +//========================================================================== +void replace(std::string& str, + const std::string& from, + const std::string& to ) +{ + std::string::size_type pos = str.find( from ); + while ( pos != std::string::npos ) + { + str.replace( pos, from.size(), to ); + pos = str.find( from, pos+from.size()-1 ); + } +} +//========================================================================== //========================================================================== @@ -59,7 +56,7 @@ int main(int argc, char **argv) } fclose(ffIn); } else { - std::cerr << "ERROR. File : "<< argv[1] <<" Not exists." << std::endl; + std::cerr << "ERROR. File : "<< argv[1] <<" does not exists." << std::endl; return 1; } diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake index a363495..0e3bd09 100644 --- a/cmake/CREAMacro_FindAndUseLibraries.cmake +++ b/cmake/CREAMacro_FindAndUseLibraries.cmake @@ -2,6 +2,22 @@ MACRO(CREA_FIND_AND_USE_LIBRARIES) +#----------------------------------------------------------------------------- +# If one can invoke this macro then crea has already been found !! +# However if one whishes to link against crea and crea was built +# with wx or vtk then we have to find them. +# This USE_CREA var is made to resolve this dependency. +IF(USE_CREA) + IF(CREA_BUILT_WITH_WX) + SET(USE_WXWIDGETS ON) + ENDIF(CREA_BUILT_WITH_WX) + IF(CREA_BUILT_WITH_VTK) + SET(USE_VTK ON) + ENDIF(CREA_BUILT_WITH_VTK) +ENDIF(USE_CREA) +#----------------------------------------------------------------------------- + + #----------------------------------------------------------------------------- IF(USE_VTK) INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseVTK.cmake) @@ -196,7 +212,7 @@ ENDIF(USE_DOXYGEN) #----------------------------------------------------------------------------- -IF(USE_LATEX) +IF(USE_LATEX) IF (NOT LATEX_COMPILER) FIND_PACKAGE(LATEX REQUIRED) MESSAGE ( STATUS "=======================================") -- 2.45.1