X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=2f33f2cb282ae66351a3b669784ce44f945d20ec;hb=91dff2fda3bda6f53a57812e82a5d36f4b61322d;hp=a33f82b246dd597d10446cc8f9f2137f4a340cc9;hpb=21c2226cf3dcad1daf3fb04818583b559694fa81;p=creaMaracasVisu.git diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt index a33f82b..2f33f2c 100644 --- a/install/CMakeLists.txt +++ b/install/CMakeLists.txt @@ -1,8 +1,3 @@ - - - - - #----------------------------------------------------------------------------- # CPACK+NSIS PACKAGING #----------------------------------------------------------------------------- @@ -15,8 +10,8 @@ INCLUDE(InstallRequiredSystemLibraries) -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "creaMaracasVisu - CREATIS-LRMN") -SET(CPACK_PACKAGE_VENDOR "CREATIS-LRMN") +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME} - CREATIS") +SET(CPACK_PACKAGE_VENDOR "CREATIS") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.txt") SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt") SET(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_MAJOR_VERSION}) @@ -24,23 +19,41 @@ SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION}) SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION}) SET(DATA_DIR ${PROJECT_SOURCE_DIR}/data ) -FILE(GLOB DATA_FILES "${DATA_DIR}/*.*") +FILE(GLOB DATA_FILES "${DATA_DIR}/*.png") FOREACH( iLST ${DATA_FILES} ) INSTALL( - FILES ${iLST} - DESTINATION bin/data + FILES ${iLST} + DESTINATION bin/data ) ENDFOREACH(iLST) -SET(DATA_DIR ${PROJECT_SOURCE_DIR}/data/Icons ) -FILE(GLOB DATA_FILES "${DATA_DIR}/*.*") + +IF (WIN32) + SET(INSTALL_DATA_DIR "bin/data") +ELSE (WIN32) + SET(INSTALL_DATA_DIR "share/creaMaracasVisu/data") +ENDIF (WIN32) + + +FILE(GLOB DATA_FILES "${DATA_DIR}/*.txt") FOREACH( iLST ${DATA_FILES} ) INSTALL( - FILES ${iLST} - DESTINATION bin/data/Icons + FILES ${iLST} + DESTINATION ${INSTALL_DATA_DIR} ) ENDFOREACH(iLST) -#SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaMaracasVisu-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") + + +## EED ...files not needed and installen in the wrong place... + +#SET(DATA_DIR ${PROJECT_SOURCE_DIR}/data/Icons ) +#FILE(GLOB DATA_FILES "${DATA_DIR}/*.xpm") +#FOREACH( iLST ${DATA_FILES} ) +# INSTALL( +# FILES ${iLST} +# DESTINATION bin/data/Icons +# ) +#ENDFOREACH(iLST) @@ -52,11 +65,12 @@ ENDFOREACH(iLST) # ENDIF(WIN32) #ELSE (BUILD_BBTK_PACKAGE_creaMaracasVisu) - - SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaMaracasVisu-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") - IF(WIN32) - SET(CMAKE_INSTALL_PREFIX C:/CreaTools/creaMaracasVisu) - ENDIF(WIN32) +IF(WIN32) + SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") +ELSE(WIN32) + SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools/${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") +ENDIF(WIN32) + #ENDIF (BUILD_BBTK_PACKAGE_creaMaracasVisu) @@ -68,9 +82,9 @@ IF(WIN32 AND NOT UNIX) # sure there is at least one set of four (4) backlasshes. #EED SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/kernel/install/gnome/bbi-icon2.bmp") # SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin/BBI_EXE.exe") - SET(CPACK_NSIS_DISPLAY_NAME "creaMaracasVisu") - SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/creatools/creaMaracasVisu") - SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr/creatools/creaMaracasVisu") + SET(CPACK_NSIS_DISPLAY_NAME "${PROJECT_NAME}") + SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/creatools/${PROJECT_NAME}") + SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr/creatools/${PROJECT_NAME}") SET(CPACK_NSIS_CONTACT "info-dev@creatis.insa-lyon.fr") SET(CPACK_NSIS_MODIFY_PATH ON) ELSE(WIN32 AND NOT UNIX) @@ -102,8 +116,8 @@ OPTION(BBTK_STANDALONE_INSTALLER "Install and add to installer all dlls needed, 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/ ) + INSTALL( FILES ${WINDIR}/system32/msvcp71d.dll DESTINATION bin/ ) + INSTALL( FILES ${WINDIR}/system32/msvcr71d.dll DESTINATION bin/ ) IF(USE_VTK) SET(VTK_BIN_DIR ${VTK_DIR}/../../bin ) @@ -118,23 +132,23 @@ IF(BBTK_STANDALONE_INSTALLER) ENDIF(USE_VTK) IF(USE_ITK) - INSTALL( FILES ${ITK_DIR}/bin/ITKCommon.dll DESTINATION bin/ ) + 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/ ) + 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)