From 861b6804685e78436e5863f041b3063eadca62cc Mon Sep 17 00:00:00 2001 From: Juan Prieto Date: Mon, 5 Oct 2009 19:41:55 +0000 Subject: [PATCH] *** empty log message *** --- cmake/CREAMacro_FindAndUseLibraries.cmake | 12 ++++++++---- src/creaVtkBasicSlicer.h | 2 +- src/creawxVTKRenderWindowInteractor.cxx | 6 +++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake index a2ce726..9e18125 100644 --- a/cmake/CREAMacro_FindAndUseLibraries.cmake +++ b/cmake/CREAMacro_FindAndUseLibraries.cmake @@ -274,15 +274,19 @@ IF(USE_BOOST) CREA_DEFINE( USE_BOOST ) IF(WIN32) - LINK_DIRECTORIES( ${Boost_INCLUDE_DIRS}/stage/lib) + + LINK_DIRECTORIES( ${Boost_INCLUDE_DIRS}/stage/lib) #JCP 01/10/2009 + #LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS}) #MESSAGE ("EED " ${Boost_LIBRARY_DIRS}) #libboost_signals-vc71-mt-1_37 #libboost_filesystem-vc71-mt-1_37 #boost_date_time-vc71-mt-1_37 + + #message("creamacro find and use lib = ${Boost_SIGNALS_LIBRARY}") SET(BOOST_LIBRARIES - boost_signals-vc90-mt-1_37 - boost_filesystem-vc90-mt-1_37 - boost_date_time-vc90-mt-1_37 + boost_signals-vc90-mt + boost_filesystem-vc90-mt + boost_date_time-vc90-mt #what about boost_thread? JPR ) diff --git a/src/creaVtkBasicSlicer.h b/src/creaVtkBasicSlicer.h index 4c110f2..b0eca92 100644 --- a/src/creaVtkBasicSlicer.h +++ b/src/creaVtkBasicSlicer.h @@ -9,7 +9,7 @@ namespace crea { - void CREA_EXPORT VtkBasicSlicer( vtkImageData* I ); + CREA_EXPORT void VtkBasicSlicer( vtkImageData* I ); } diff --git a/src/creawxVTKRenderWindowInteractor.cxx b/src/creawxVTKRenderWindowInteractor.cxx index 107c0e3..4f6a0bb 100644 --- a/src/creawxVTKRenderWindowInteractor.cxx +++ b/src/creawxVTKRenderWindowInteractor.cxx @@ -3,8 +3,8 @@ Program: Visualization Toolkit Module: $RCSfile: creawxVTKRenderWindowInteractor.cxx,v $ Language: C++ - Date: $Date: 2009/01/07 12:55:23 $ - Version: $Revision: 1.4 $ + Date: $Date: 2009/10/05 19:41:56 $ + Version: $Revision: 1.5 $ Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen All rights reserved. @@ -160,7 +160,7 @@ creawxVTKRenderWindowInteractor::creawxVTKRenderWindowInteractor(wxWindow *paren #if defined(__WXGTK__) && defined(USE_WXGLCANVAS) : vtkRenderWindowInteractor(), wxGLCanvas(parent, id, pos, size, style, name) #else - : vtkRenderWindowInteractor(), wxWindow(parent, id, pos, size, style, name) + : wxWindow(parent, id, pos, size, style, name), vtkRenderWindowInteractor() #endif //__WXGTK__ , timer(this, ID_creawxVTKRenderWindowInteractor_TIMER) , ActiveButton(wxEVT_NULL) -- 2.47.1