From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Fri, 22 Jan 2010 19:16:51 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~43
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3180a06a27000a5f44af4843b4ad0cc74d85066f;p=crea.git

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

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index e55bce9..c54c85b 100644
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -1,7 +1,7 @@
 
 
 MACRO(CREA_FIND_AND_USE_LIBRARIES)
-
+OPTION(DEBUG "Use debug libraries" ON)
 #-----------------------------------------------------------------------------
 # If one can invoke this macro then crea has already been found !!
 # However if one whishes to link against crea and crea was built 
@@ -284,13 +284,20 @@ IF(USE_BOOST)
 		#boost_date_time-vc71-mt-1_37
 	
 		#message("creamacro find and use lib = ${Boost_SIGNALS_LIBRARY}")
-		SET(BOOST_LIBRARIES
+		IF(DEBUG)
+			SET(BOOST_LIBRARIES
+				boost_signals-vc90-mt-gd-1_40
+				boost_filesystem-vc90-mt-gd-1_40
+				boost_date_time-vc90-mt-gd-1_40			   
+			   #what about boost_thread? JPR
+			)
+		ELSE(NOT DEBUG)
+			SET(BOOST_LIBRARIES
 				boost_signals-vc90-mt-1_40
-                boost_filesystem-vc90-mt-1_40
-                boost_date_time-vc90-mt-1_40
-		   
-		   #what about boost_thread? JPR
-	    )
+				boost_filesystem-vc90-mt-1_40
+				boost_date_time-vc90-mt-1_40
+			)
+		ENDIF(DEBUG)
 	  ENDIF(WIN32)
       IF(NOT WIN32)
       	IF(APPLE)
diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index 6876d4b..cceae9a 100644
--- a/cmake/CREAMacro_FindAndUseWxWidgets.cmake
+++ b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
@@ -12,7 +12,11 @@ MACRO(CREA_FIND_WXWIDGETS)
     
     #wxWidgets build related stuff
     # DO NOT FORCE DEBUG LIBS !!
-    SET(WXW_USE_DEBUG OFF)
+	IF(DEBUG)
+		SET(WXW_USE_DEBUG ON)
+	ELSE (NOT DEBUG)
+		SET(WXW_USE_DEBUG OFF)
+	ENDIF(DEBUG)
     SET(WXW_USE_UNICODE OFF)
     SET(WXW_USE_SHARED ON)
     SET(WXW_USE_UNIV OFF)
diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index a254cce..b193712 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -93,6 +93,7 @@ ELSE(WIN32 AND NOT UNIX)
   SET(CPACK_SOURCE_STRIP_FILES "")
 ENDIF(WIN32 AND NOT UNIX)
 SET(CPACK_PACKAGE_EXECUTABLES "creaNewProject" "New project")
+
   
 
 INCLUDE(CPack)
diff --git a/src/creawxVTKRenderWindowInteractor.h b/src/creawxVTKRenderWindowInteractor.h
index e1378d6..d0b90df 100644
--- a/src/creawxVTKRenderWindowInteractor.h
+++ b/src/creawxVTKRenderWindowInteractor.h
@@ -3,8 +3,8 @@
   Program:   Visualization Toolkit
   Module:    $RCSfile: creawxVTKRenderWindowInteractor.h,v $
   Language:  C++
-  Date:      $Date: 2008/12/11 14:27:00 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2010/01/22 19:16:54 $
+  Version:   $Revision: 1.3 $
 
   Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen 
   All rights reserved.
@@ -99,7 +99,7 @@ namespace crea
 #if defined(__WXGTK__) && defined(USE_WXGLCANVAS)
 class CREA_EXPORT creawxVTKRenderWindowInteractor : public wxGLCanvas, virtual public vtkRenderWindowInteractor
 #else
-class CREA_EXPORT creawxVTKRenderWindowInteractor : public wxWindow, virtual public vtkRenderWindowInteractor
+class CREA_EXPORT creawxVTKRenderWindowInteractor : virtual public vtkRenderWindowInteractor, public wxWindow
 #endif //__WXGTK__
 {
   DECLARE_DYNAMIC_CLASS(creawxVTKRenderWindowInteractor)