From: Eduardo Davila Date: Thu, 19 Mar 2009 08:00:45 +0000 (+0000) Subject: BUG link boost X-Git-Tag: EED.02Oct2009~38 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a1069f9754d7b29ffc6fbee220e6ee45a64e6450;p=crea.git BUG link boost --- diff --git a/appli/creaNewProject/CMakeLists.txt b/appli/creaNewProject/CMakeLists.txt index 165891b..31682db 100644 --- a/appli/creaNewProject/CMakeLists.txt +++ b/appli/creaNewProject/CMakeLists.txt @@ -6,7 +6,7 @@ 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 boost_signals) +SET(${EXE_NAME}_LINK_LIBRARIES crea ) CREA_ADD_EXECUTABLE( ${EXE_NAME} ) #============================================================================ diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake index 6ba64be..4bc86ac 100644 --- a/cmake/CREAMacro_FindAndUseLibraries.cmake +++ b/cmake/CREAMacro_FindAndUseLibraries.cmake @@ -251,6 +251,7 @@ IF(USE_TTH) ENDIF(USE_TTH) #----------------------------------------------------------------------------- + #----------------------------------------------------------------------------- IF(USE_BOOST) IF(NOT Boost_FOUND) diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake index 527d94f..61dff38 100644 --- a/cmake/CREAMacro_FindAndUseWxWidgets.cmake +++ b/cmake/CREAMacro_FindAndUseWxWidgets.cmake @@ -36,7 +36,7 @@ MACRO(CREA_FIND_WXWIDGETS) pkg_check_modules (GTK2 gtk+-2.0) #MESSAGE("${GTK2_INCLUDE_DIRS}") # Can I require all my user to have the gl lib on linux, even if they do not really need it... - SET(WXGLCANVASLIBS "gl") +#EED SET(WXGLCANVASLIBS "gl") # aui ? SET(WXAUILIBS "aui") # LG : These options should be set by the user at top level of crea diff --git a/src/creaFilesFromDirectory.cxx b/src/creaFilesFromDirectory.cxx index 06c5e6f..e9d1f46 100644 --- a/src/creaFilesFromDirectory.cxx +++ b/src/creaFilesFromDirectory.cxx @@ -3,8 +3,8 @@ Program: crea Module: $RCSfile: creaFilesFromDirectory.cxx,v $ Language: C++ - Date: $Date: 2008/12/03 14:53:42 $ - Version: $Revision: 1.2 $ + Date: $Date: 2009/03/19 08:00:50 $ + Version: $Revision: 1.3 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -53,6 +53,7 @@ std::string DirList::NormalizePath(std::string const &pathname) const char FILESEPARATOR = '/'; #endif + std::string name = pathname; int size = name.size(); diff --git a/src/creaSystem.cxx b/src/creaSystem.cxx index 73bd4ac..b60816c 100644 --- a/src/creaSystem.cxx +++ b/src/creaSystem.cxx @@ -5,7 +5,7 @@ namespace crea #ifdef _WIN32 int System::HasTTY() { return false; } -#else +#else #include int System::HasTTY() {