X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=ca262af09236e03d5be85187922f6f8f0ad619cb;hb=HEAD;hp=f41e879517ea1a41c79d3cca8cdf78d23479af79;hpb=0dc73be17c83bd4fb7c3ad2b1dadb5e614dcfcb6;p=creaTools.git diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt index f41e879..ca262af 100644 --- a/install/CMakeLists.txt +++ b/install/CMakeLists.txt @@ -35,7 +35,6 @@ INCLUDE(InstallRequiredSystemLibraries) SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME} - CREATIS") - SET(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-${CREATOOLS_BUILDTYPE}") SET(CPACK_PACKAGE_VENDOR "CREATIS") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.txt") @@ -43,11 +42,12 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt") SET(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_MAJOR_VERSION}) SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION}) SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION}) +SET(CPACK_SYSTEM_NAME ${CREATOOLS_PLATFORM}) # SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") IF(WIN32) - SET(CMAKE_INSTALL_PREFIX C:/CreaTools/creatools_Installer_NormalUser) + SET(CMAKE_INSTALL_PREFIX C:/CreaTools/CeaTools) ENDIF(WIN32) @@ -59,7 +59,7 @@ 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 "creatools_Installer_NormalUser") +#EED 01/05/2013 SET(CPACK_NSIS_DISPLAY_NAME "CreaTools") 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") @@ -74,6 +74,7 @@ IF(WIN32 AND NOT UNIX) set (CREA_BASE crea) set (CREA_BBTK bbtk) set (CREA_MARACASVISU creaMaracasVisu) + set (CREA_VTK creaVtk) set (CREA_IMAGEIO creaImageIO) set (CREA_CONTOURS creaContours) set (CREA_ENVIRIONMENT creaEnvironment) @@ -103,6 +104,7 @@ IF(WIN32 AND NOT UNIX) SET(CREA_BASE_DIRBIN "$INSTDIR\\\\${CREA_BASE}\\\\bin") SET(CREA_BBTK_DIRBIN "$INSTDIR\\\\${CREA_BBTK}\\\\bin") SET(CREA_MARACASVISU_DIRBIN "$INSTDIR\\\\${CREA_MARACASVISU}\\\\bin") + SET(CREA_VTK_DIRBIN "$INSTDIR\\\\${CREA_VTK}\\\\bin") SET(CREA_IMAGEIO_DIRBIN "$INSTDIR\\\\${CREA_IMAGEIO}\\\\bin") SET(CREA_CONTOURS_DIRBIN "$INSTDIR\\\\${CREA_CONTOURS}\\\\bin") SET(CREA_ENVIRIONMENT_DIRBIN "$INSTDIR\\\\${CREA_ENVIRIONMENT}\\\\bin") @@ -127,10 +129,13 @@ IF(WIN32 AND NOT UNIX) WriteRegExpandStr \\\${Install_ReadEnvStr_RegKey} 'PATH' $0 AddToPath_doneEED: + CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Version.txt.lnk' '${CREATOOLS_DIRBIN}\\\\..\\\\Version.txt' + SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 - CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\creaTools_HomePage.lnk' '${CREATOOLS_DIRBIN}\\\\start.bat' 'www.creatis.insa-lyon.fr/site/creatools' - CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\creaTools.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat' 'bbi.exe bbs\\\\creaMiniTools\\\\appli\\\\minitoolsMenu.bbs' + CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Update_CreaTools.lnk' '${CREATOOLS_DIRBIN}\\\\UpdateCreatools.bat.lnk' + CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\CreaTools_HomePage.lnk' '${CREATOOLS_DIRBIN}\\\\start.bat' 'www.creatis.insa-lyon.fr/site7/creatools' + CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\CreaTools.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat' 'bbi.exe bbs\\\\creaMiniTools\\\\appli\\\\minitoolsMenu.bbs' # CreateDirectory '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Developer_Tools' # CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Developer_Tools\\\\creaNewProject.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat' 'creaNewProject.exe' @@ -165,6 +170,8 @@ IF(WIN32 AND NOT UNIX) !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\CreaTools_HomePage.lnk' Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\ creaTools.lnk' + Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Version.txt.lnk' + Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Update_CreaTools.lnk' # Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Developer_Tools\\\\creaNewProject.lnk' # Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Developer_Tools\\\\bbStudio.lnk' @@ -220,12 +227,15 @@ IF (WIN32) #INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_THIRDPARTY_DLLS}\\\\bin/ DESTINATION "${CREATOOLS_DESTINATION_PATH}/bin" ) #INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_THIRDPARTY_LIBRARIES}\\\\Library/ DESTINATION ${CREATOOLS_DESTINATION_PATH} ) +INSTALL(FILES ${${CMAKE_PROJECT_NAME}_BINARY_DIR}/Version.txt DESTINATION . ) + INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/bin/ DESTINATION bin ) INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/data/ DESTINATION bin/data ) INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BASE}/ DESTINATION ${CREATOOLS_DESTINATION_PATH} ) INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BBTK}/ DESTINATION ${CREATOOLS_DESTINATION_PATH} ) -INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_IMAGEIO}/ DESTINATION ${CREATOOLS_DESTINATION_PATH} ) INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_MARACASVISU}/ DESTINATION ${CREATOOLS_DESTINATION_PATH} ) +INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_VTK}/ DESTINATION ${CREATOOLS_DESTINATION_PATH} ) +INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_IMAGEIO}/ DESTINATION ${CREATOOLS_DESTINATION_PATH} ) INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_CONTOURS}/ DESTINATION ${CREATOOLS_DESTINATION_PATH} ) INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_ENVIRIONMENT}/ DESTINATION ${CREATOOLS_DESTINATION_PATH} ) INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_RECALAGE}/ DESTINATION ${CREATOOLS_DESTINATION_PATH} ) @@ -236,4 +246,9 @@ INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_MINITOOLS}/ DESTINATION $ ENDIF (WIN32) +IF (UNIX) + install( FILES ${PROJECT_BINARY_DIR}/Version.sh DESTINATION share/creatools ) + install( FILES ${PROJECT_BINARY_DIR}/Version.txt DESTINATION share/creatools ) +ENDIF (UNIX) +