X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=52f9f4890c90c37f37f1202961d55790ba6a5cf6;hb=852af4a5c6e97a6fc349126cf3370e27f89fe067;hp=f3b2af04ce0e9c397f24390c6c6fa1feaad250dc;hpb=a0e82d165951ac064a95dfa9360590db49bc8d77;p=creaImageIO.git

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index f3b2af0..52f9f48 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -12,7 +12,6 @@
 #http://www.cmake.org/Wiki/CMake:CPackConfiguration
 #http://www.cmake.org/Wiki/CMake:Install_Commands
 
-
 INCLUDE(InstallRequiredSystemLibraries)
 
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "creaImageIO - CREATIS-LRMN")
@@ -38,7 +37,8 @@ SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION})
 
 #ELSE (BUILD_BBTK_PACKAGE_creaImageIO)
 
-  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaImageIO-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\Dicom Layer-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+ # SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaImageIO-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
   IF(WIN32)
     SET(CMAKE_INSTALL_PREFIX C:/CreaTools/creaImageIO)
   ENDIF(WIN32)
@@ -67,60 +67,87 @@ 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(EXWIN32)
+  IF(WIN32)
+    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)
+
+  #STRING(REGEX REPLACE "\\\\" "/" WINDIR "$ENV{WINDIR}")
+  INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/msvcp71d.dll  				DESTINATION bin/ )
+  INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo//msvcr71d.dll  				DESTINATION bin/ )
+  INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo//crea.dll  				DESTINATION bin/ )
+
+  #IF(USE_VTK)
+   # SET(VTK_BIN_DIR ${VTK_DIR}/../../bin )
+#    FILE(GLOB LST_FILE_VTKDLL "${VTK_BIN_DIR}/*.dll")
+ #   FOREACH( iLST  ${LST_FILE_VTKDLL} )
+  #     INSTALL( 
+   #      FILES ${iLST}
+    #     DESTINATION bin/
+     #  )
+    #ENDFOREACH(iLST)
+  #ENDIF(USE_VTK)
+    
 
-OPTION(BBTK_STANDALONE_INSTALLER "Install and add to installer all dlls needed, including from external toolkits (wx,itk,vtk)?" OFF)
+  IF(USE_WXWIDGETS)
+   # INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll   			DESTINATION bin/ )
+    INSTALL(   FILES   ${PROJECT_BINARY_DIR}/relwithdebinfo/wxmsw28d_xrc_vc_custom.dll   			DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxmsw28d_richtext_vc_custom.dll   	DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxmsw28d_qa_vc_custom.dll	   			DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxmsw28d_media_vc_custom.dll   		DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxmsw28d_html_vc_custom.dll   		DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxmsw28d_gl_vc_custom.dll	   			DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxmsw28d_core_vc_custom.dll   		DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxmsw28d_aui_vc_custom.dll   			DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxmsw28d_adv_vc_custom.dll   			DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxbase28d_xml_vc_custom.dll   		DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxbase28d_vc_custom.dll	   			DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxbase28d_odbc_vc_custom.dll   		DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxbase28d_net_vc_custom.dll  			DESTINATION bin/ )
+  ENDIF(USE_WXWIDGETS)
 
-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/ )
+ENDIF(WIN32)
 
-  IF(USE_VTK)
-    SET(VTK_BIN_DIR ${VTK_DIR}/../../bin )
+ENDIF (BUILD_STANDALONE_INSTALLER)
 
-    FILE(GLOB LST_FILE_VTKDLL "${VTK_BIN_DIR}/*.dll")
-    FOREACH( iLST  ${LST_FILE_VTKDLL} )
-       INSTALL( 
-         FILES ${iLST}
-         DESTINATION bin/
-       )
-    ENDFOREACH(iLST)
-  ENDIF(USE_VTK)
-    
-  IF(USE_ITK)
-    INSTALL(   FILES ${ITK_DIR}/bin/ITKCommon.dll   	DESTINATION bin/ )
-  ENDIF(USE_ITK)
 
-  IF(USE_WXWIDGETS)
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll   			DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_richtext_vc_custom.dll   	DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_qa_vc_custom.dll	   			DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_media_vc_custom.dll   		DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_html_vc_custom.dll   		DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_gl_vc_custom.dll	   			DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_core_vc_custom.dll   		DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_aui_vc_custom.dll   			DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_adv_vc_custom.dll   			DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_xml_vc_custom.dll   		DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_vc_custom.dll	   			DESTINATION bin/ )
-    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)