X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=3e14d9d71158f9232b43798980c9fe27108fa606;hb=c0953bc3ee5159982b285fc3271799ee9a8af824;hp=52f9f4890c90c37f37f1202961d55790ba6a5cf6;hpb=0aa00616066c059f5b11bf6355c22c90c22f95f0;p=creaImageIO.git diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt index 52f9f48..3e14d9d 100644 --- a/install/CMakeLists.txt +++ b/install/CMakeLists.txt @@ -23,28 +23,12 @@ SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION}) SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION}) - -#SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaImageIO-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") - - - -#IF (BUILD_BBTK_PACKAGE_creaImageIO) -# -# SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\bbtk-${BBTK_VERSION}") -# IF(WIN32) -# SET(CMAKE_INSTALL_PREFIX C:/CreaTools/bbtk-${BBTK_VERSION}) -# ENDIF(WIN32) - -#ELSE (BUILD_BBTK_PACKAGE_creaImageIO) - - 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}") + 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) + SET(CMAKE_INSTALL_PREFIX ${CPACK_PACKAGE_INSTALL_DIRECTORY}) ENDIF(WIN32) -#ENDIF (BUILD_BBTK_PACKAGE_creaImageIO) @@ -62,12 +46,16 @@ ELSE(WIN32 AND NOT UNIX) # SET(CPACK_STRIP_FILES "bin/bbi") SET(CPACK_SOURCE_STRIP_FILES "") ENDIF(WIN32 AND NOT UNIX) -SET(CPACK_PACKAGE_EXECUTABLES "TestWxGimmickDialog" "Gimmick!") +SET(CPACK_PACKAGE_EXECUTABLES "TestWxGimmickReaderDialog" "TestWxGimmickReaderDialog") INCLUDE(CPack) OPTION(BUILD_STANDALONE_INSTALLER "Build installer which installs all the third-party dynamic libraries needed ?" OFF) +IF(BUILD_STANDALONE_INSTALLER) + SET (ADDITIONAL_DLL_PATH "C:/Program Files/CreaTools/crea_ThirdParty_dlls-0.2.0/bin" CACHE PATH "Additional paths in which to look for dlls") +ENDIF(BUILD_STANDALONE_INSTALLER) + # Aditional INSTALL for CPACK mecanism. IF (WIN32) @@ -81,70 +69,33 @@ ENDIF (WIN32) IF (BUILD_STANDALONE_INSTALLER) 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 ${SYSTEMROOT}/system32/msvcp71d.dll DESTINATION bin/ ) + INSTALL( FILES ${SYSTEMROOT}/system32/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) + INSTALL( FILES ${PROJECT_BINARY_DIR}/relwithdebinfo//sqlite3.dll DESTINATION bin/ ) + + #VTK dlls + #GDCM dlls + #WXWIDGETS dlls + IF(USE_VTK) + FILE(GLOB LST_FILE_VTKDLL "${ADDITIONAL_DLL_PATH}/*.dll") + FOREACH( iLST ${LST_FILE_VTKDLL} ) + INSTALL( + FILES ${iLST} + DESTINATION bin/ + ) + ENDFOREACH(iLST) + ENDIF(USE_VTK) - - 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(USE_BOOST) + INSTALL( FILES ${Boost_INCLUDE_DIR}/lib/boost_date_time-vc71-mt-1_38.dll DESTINATION bin/ ) + INSTALL( FILES ${Boost_INCLUDE_DIR}/lib/boost_filesystem-vc71-mt-1_38.dll DESTINATION bin/ ) + INSTALL( FILES ${Boost_INCLUDE_DIR}/lib/boost_iostreams-vc71-mt-1_38.dll DESTINATION bin/ ) + INSTALL( FILES ${Boost_INCLUDE_DIR}/lib/boost_signals-vc71-mt-1_38.dll DESTINATION bin/ ) + INSTALL( FILES ${Boost_INCLUDE_DIR}/lib/boost_thread-vc71-mt-1_38.dll DESTINATION bin/ ) + ENDIF(USE_BOOST) + + ENDIF(WIN32) ENDIF (BUILD_STANDALONE_INSTALLER)