X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=7b430a53e38a62a967de6a85527f3dd56c156a42;hb=887231b4fcb3ab4d183936211a764d8a27e07e42;hp=f3b2af04ce0e9c397f24390c6c6fa1feaad250dc;hpb=a0e82d165951ac064a95dfa9360590db49bc8d77;p=creaImageIO.git diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt index f3b2af0..7b430a5 100644 --- a/install/CMakeLists.txt +++ b/install/CMakeLists.txt @@ -1,8 +1,4 @@ - - - - #----------------------------------------------------------------------------- # CPACK+NSIS PACKAGING #----------------------------------------------------------------------------- @@ -12,7 +8,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") @@ -24,30 +19,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\\\\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) - - - IF(WIN32 AND NOT UNIX) # There is a bug in NSI that does not handle full unix paths properly. Make # sure there is at least one set of four (4) backlasshes. @@ -62,65 +39,56 @@ 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) - INSTALL( FILES ${PROJECT_SOURCE_DIR}/win32/sqlite3.dll DESTINATION bin ) - ENDIF (WIN32) + INSTALL( FILES ${PROJECT_SOURCE_DIR}/src2/data/localdatabase_Descriptor.txt DESTINATION bin/Shared/gimmick ) + +IF (BUILD_STANDALONE_INSTALLER) - - - - - -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/ ) - + IF(WIN32) + 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/ ) + INSTALL( FILES ${PROJECT_BINARY_DIR}/relwithdebinfo//sqlite3.dll DESTINATION bin/ ) + + #VTK dlls + #GDCM dlls + #WXWIDGETS dlls IF(USE_VTK) - SET(VTK_BIN_DIR ${VTK_DIR}/../../bin ) - - FILE(GLOB LST_FILE_VTKDLL "${VTK_BIN_DIR}/*.dll") + 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_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) + 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) + + +