X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=2f33f2cb282ae66351a3b669784ce44f945d20ec;hb=91dff2fda3bda6f53a57812e82a5d36f4b61322d;hp=c6e829b40d3f5a2f24b3fa6bc6071250dc5addd9;hpb=6122902d237f5e5ceaeda06ddb6be30663233d33;p=creaMaracasVisu.git

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index c6e829b..2f33f2c 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -10,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})
@@ -27,16 +27,33 @@ FOREACH( iLST  ${DATA_FILES} )
    )
 ENDFOREACH(iLST)
 
-SET(DATA_DIR ${PROJECT_SOURCE_DIR}/data/Icons )
-FILE(GLOB DATA_FILES "${DATA_DIR}/*.xpm")
+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
+       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)
 
 
 
@@ -48,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)
@@ -64,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)