X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=33591957b51ccad24681fa988e78ef5de4c0dca7;hb=2f967c5bad779bbd755c2fe159c451ae760b7dbe;hp=01ea667c99060e7def6b4a01ee9c94b78b33eb32;hpb=94f24817d3f0a4596e21412acb4229e740db983c;p=creaTools.git

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 01ea667..3359195 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -42,23 +42,24 @@ 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}")
+
+# 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\\\\CreaTools-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
   IF(WIN32)
     SET(CMAKE_INSTALL_PREFIX C:/CreaTools/CeaTools)
   ENDIF(WIN32)
 
 
 
-
-
 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.
 #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")
-#EED 01/05/2013  SET(CPACK_NSIS_DISPLAY_NAME "CreaTools")
+
+  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")
@@ -132,7 +133,6 @@ IF(WIN32 AND NOT UNIX)
 
 		SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 
 
-		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'
 
@@ -219,6 +219,7 @@ ENDIF(WIN32 AND NOT UNIX)
 
 INCLUDE(CPack)
 
+message("-------------------------------- "${CREATOOLS_SOURCE_PATH})
 
 # Aditional INSTALL for CPACK mecanism.
 IF (WIN32)
@@ -229,18 +230,19 @@ IF (WIN32)
 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_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}  )
-INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BRUKER}/ 			DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
-INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BBTKGEDITOR}/ 		DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
-INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_MINITOOLS}/ 		DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
+INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/data/ 							DESTINATION bin/data  ) 
+INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}/         	         		DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
+#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_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}  )
+#INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BRUKER}/ 			DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
+#INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BBTKGEDITOR}/ 		DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
+#INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_MINITOOLS}/ 		DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 #INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_IRM}/ 			DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 ENDIF (WIN32)