BUG link boost

diff --git a/appli/creaNewProject/CMakeLists.txt b/appli/creaNewProject/CMakeLists.txt
index 165891b4d657a5c26031fb28cbcf9e35b3161532..31682db66981462e6f14f0b568e94f3f64bb064f 100644 (file)
--- 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 6ba64be8737eee39f70d9683de586af74b4ce602..4bc86ac1e21814cec433bdb978e568a2371ff00e 100644 (file)
--- 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 527d94fc7fca88c382446bfd351bc764f461f12f..61dff385eca3883c650840f71953b6c16cd7ca42 100644 (file)
--- 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 06c5e6f024895bb148c9b694845cae3eee698cb8..e9d1f46c38a41330616c1124a9abd5f4f9486aed 100644 (file)
--- 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 73bd4ac64867b8d12a0961790c92c9e63ae29b32..b60816c02683d1bd992824f9e656baf92c196a48 100644 (file)
--- a/src/creaSystem.cxx
+++ b/src/creaSystem.cxx
@@ -5,7 +5,7 @@ namespace crea
 
 #ifdef _WIN32
   int System::HasTTY() { return false; }
-#else 
+#else  
 #include <unistd.h>
    int System::HasTTY() 
    {