From: guigues <guigues>
Date: Thu, 2 Oct 2008 12:29:43 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v0.1.0~7
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=fe6f9cc78b47ca7a8d70d511de72fb76fd82300a;p=crea.git

*** empty log message ***
---

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index 42d62c2..0d2a29a 100644
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -195,16 +195,18 @@ ENDIF(USE_TTH)
 #-----------------------------------------------------------------------------
 IF(USE_BOOST)
   FIND_PACKAGE(Boost REQUIRED)
-  MARK_AS_ADVANCED(Boost_INCLUDE_DIR)
   IF(Boost_FOUND)
     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(NOT WIN32)
     SET(BOOST_LIBRARIES
       boost_signals
       boost_filesystem
       )
+      ENDIF(NOT WIN32)
+	MARK_AS_ADVANCED(Boost_INCLUDE_DIR)
   ELSE(Boost_FOUND)
     MESSAGE(FATAL_ERROR "boost C++ library not found - Set Boost_INCLUDE_DIR to the directory containing boost headers")
   ENDIF(Boost_FOUND)
diff --git a/src/creaRTTI.h b/src/creaRTTI.h
index a54e490..df9ce56 100644
--- a/src/creaRTTI.h
+++ b/src/creaRTTI.h
@@ -3,8 +3,8 @@
   Program:   crea
   Module:    $RCSfile: creaRTTI.h,v $
   Language:  C++
-  Date:      $Date: 2008/09/26 14:09:55 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/10/02 12:29:45 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -156,6 +156,7 @@ namespace crea
     template <> inline std::string HumanTypeName< std::vector<TYPE> >	\
     (const std::vector<TYPE>&) { return "Vector"+HumanTypeName<TYPE>(); }	
 
+  /*
   CREA_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME(int8_t);
   CREA_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME(uint8_t);
   CREA_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME(int16_t);
@@ -166,7 +167,7 @@ namespace crea
   CREA_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME(float);
   CREA_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME(double);
   CREA_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME(std::string);
-
+*/
 /// The crea::TypeInfo type is a const ref on std::type_info (which can only be manipulated as such (because typeid returns const std::type_info& and type_info has all constructors private)) 
   typedef const std::type_info& TypeInfo;
 
diff --git a/src/creaVtkBasicSlicer.h b/src/creaVtkBasicSlicer.h
index cda191a..4c110f2 100644
--- a/src/creaVtkBasicSlicer.h
+++ b/src/creaVtkBasicSlicer.h
@@ -3,12 +3,13 @@
 
 #ifdef USE_VTK
 
+#include <creaSystem.h>
 #include <vtkImageData.h>
 
 namespace crea
 {
   
-  void VtkBasicSlicer( vtkImageData* I );
+  void CREA_EXPORT VtkBasicSlicer( vtkImageData* I );
 }
 
 
diff --git a/src/wxVTKRenderWindowInteractor.h b/src/wxVTKRenderWindowInteractor.h
index 913cb58..3190c87 100644
--- a/src/wxVTKRenderWindowInteractor.h
+++ b/src/wxVTKRenderWindowInteractor.h
@@ -3,8 +3,8 @@
   Program:   Visualization Toolkit
   Module:    $RCSfile: wxVTKRenderWindowInteractor.h,v $
   Language:  C++
-  Date:      $Date: 2008/09/26 14:09:55 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/10/02 12:29:45 $
+  Version:   $Revision: 1.2 $
 
   Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen 
   All rights reserved.
@@ -37,6 +37,10 @@
 #ifndef _wxVTKRenderWindowInteractor_h_
 #define _wxVTKRenderWindowInteractor_h_
 
+#include <creaSystem.h>
+#include <creaWx.h>
+
+/*
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -47,7 +51,7 @@
 #ifndef WX_PRECOMP
 #include <wx/wx.h>
 #endif
-
+*/
 #include <wx/timer.h>
 #include <wx/dcclient.h>
 
@@ -90,9 +94,9 @@ namespace crea
 
 
 #if defined(__WXGTK__) && defined(USE_WXGLCANVAS)
-class VTK_RENDERING_EXPORT wxVTKRenderWindowInteractor : public wxGLCanvas, virtual public vtkRenderWindowInteractor
+class CREA_EXPORT wxVTKRenderWindowInteractor : public wxGLCanvas, virtual public vtkRenderWindowInteractor
 #else
-class /*VTK_RENDERING_EXPORT*/ wxVTKRenderWindowInteractor : public wxWindow, virtual public vtkRenderWindowInteractor
+class CREA_EXPORT wxVTKRenderWindowInteractor : public wxWindow, virtual public vtkRenderWindowInteractor
 #endif //__WXGTK__
 {
   DECLARE_DYNAMIC_CLASS(wxVTKRenderWindowInteractor)