From: guigues <guigues>
Date: Thu, 9 Apr 2009 07:24:07 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~110
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0dbaeaed2438cdc47881efd30c52f36b7bc73206;p=creaImageIO.git

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

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index f3b2af0..7f1e829 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -67,25 +67,59 @@ SET(CPACK_PACKAGE_EXECUTABLES "TestWxGimmickDialog" "Gimmick!")
 
 INCLUDE(CPack)
 
+OPTION(BUILD_STANDALONE_INSTALLER "Build installer which installs all the third-party dynamic libraries needed ?" OFF) 
 
 # Aditional INSTALL for CPACK mecanism.
 IF (WIN32)
 
   INSTALL( FILES ${PROJECT_SOURCE_DIR}/win32/sqlite3.dll DESTINATION bin ) 
 
-ENDIF (WIN32)
+     
 
+ENDIF (WIN32)
+ 
+IF (BUILD_STANDALONE_INSTALLER)
 
+  IF(WIN32)
 
+    INSTALL (FILES ${EXECUTABLE_OUTPUT_PATH}relwithdebinfo/vv.exe DESTINATION bin)
+    INSTALL (FILES ${QT_PLUGINS_DIR}/../bin/QtCore4.dll DESTINATION bin)
+    INSTALL (FILES ${QT_PLUGINS_DIR}/../bin/QtGui4.dll DESTINATION bin)
+    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkCommon.dll DESTINATION bin)
+    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtksys.dll DESTINATION bin)
+    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkRendering.dll DESTINATION bin)
+    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkGraphics.dll DESTINATION bin)
+    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkImaging.dll DESTINATION bin)
+    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkFiltering.dll DESTINATION bin)
+    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkGenericFiltering.dll DESTINATION bin)
+    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkIO.dll DESTINATION bin)
+    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/verdict.dll DESTINATION bin)
+    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/QVTK.dll DESTINATION bin)
+    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/QVTKWidgetPlugin.dll DESTINATION bin)
+    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkDICOMParser.dll DESTINATION bin)
+    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkexoIIc.dll DESTINATION bin)
+    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkexpat.dll DESTINATION bin)
+    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkmetaio.dll DESTINATION bin)
+    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkftgl.dll DESTINATION bin)
+    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkfreetype.dll DESTINATION bin)
+  INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkGenericFiltering.dll DESTINATION bin)
+  INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkHybrid.dll DESTINATION bin)
+  INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkInfovis.dll DESTINATION bin)
+  INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkjpeg.dll DESTINATION bin)
+  INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtklibxml2.dll DESTINATION bin)
+  INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkNetCDF.dll DESTINATION bin)
+  INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkpng.dll DESTINATION bin)
+  INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtktiff.dll DESTINATION bin)
+  INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkViews.dll DESTINATION bin)
+  INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkVolumeRendering.dll DESTINATION bin)
+  INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkWidgets.dll DESTINATION bin)
+  INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkzlib.dll DESTINATION bin)
 
 
 
 
-IF(EXWIN32)
 
-OPTION(BBTK_STANDALONE_INSTALLER "Install and add to installer all dlls needed, including from external toolkits (wx,itk,vtk)?" OFF)
 
-IF(BBTK_STANDALONE_INSTALLER)
   STRING(REGEX REPLACE "\\\\" "/" WINDIR "$ENV{WINDIR}")
   INSTALL(   FILES ${WINDIR}/system32/msvcp71d.dll  				DESTINATION bin/ )
   INSTALL(   FILES ${WINDIR}/system32/msvcr71d.dll  				DESTINATION bin/ )
@@ -121,6 +155,12 @@ IF(BBTK_STANDALONE_INSTALLER)
     INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_odbc_vc_custom.dll   		DESTINATION bin/ )
     INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll  			DESTINATION bin/ )
   ENDIF(USE_WXWIDGETS)
-ENDIF(BBTK_STANDALONE_INSTALLER)
 
-ENDIF(EXWIN32)
+ELSE(WIN32)
+  
+ENDIF(WIN32)
+
+ENDIF (BUILD_STANDALONE_INSTALLER)
+
+
+
diff --git a/src2/doxygen/CMakeLists.txt b/src2/doxygen/CMakeLists.txt
index a000c3c..4d7c9b9 100644
--- a/src2/doxygen/CMakeLists.txt
+++ b/src2/doxygen/CMakeLists.txt
@@ -75,14 +75,14 @@ ENDMACRO(CREA_BUILD_DOXYGEN_DOC)
 
 FILE(GLOB PAGES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.htm")
 
-MESSAGE("DOXYGEN HTML PAGES = ${PAGES}")
+#MESSAGE(STATUS "DOXYGEN HTML PAGES = ${PAGES}")
 FOREACH(PAGE ${PAGES})
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/${PAGE}
     ${PROJECT_BINARY_DIR}/doxygen/${PAGE}
     IMMEDIATE
   )
-	MESSAGE("COPYING ${PAGE} TO ${PROJECT_BINARY_DIR}/doxygen/${PAGE}")
+#MESSAGE(STATUS "COPYING ${PAGE} TO ${PROJECT_BINARY_DIR}/doxygen/${PAGE}")
 ENDFOREACH(PAGE)
 
 CONFIGURE_FILE(