X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=5289b7a7b5156e23f93aefc65a1c55130873e554;hb=1484229c7f3dab0bc65f08edc2e8d477f92424ff;hp=16fbe5306bd22df524e19c2557fb0b3bafa9a5ae;hpb=e7d3c47803d3341d27c134738499e92a1fef426c;p=creaMaracasVisu.git

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 16fbe53..5289b7a 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -1,3 +1,29 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */ 
+
+
 #-----------------------------------------------------------------------------
 # CPACK+NSIS PACKAGING
 #-----------------------------------------------------------------------------
@@ -27,17 +53,36 @@ 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)
 
 
 
+## 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)
+
+
+
 #IF (BUILD_BBTK_PACKAGE_creaMaracasVisu)
 #
 #  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\bbtk-${BBTK_VERSION}")
@@ -52,9 +97,6 @@ ELSE(WIN32)
 	SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools/${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 ENDIF(WIN32)
   
-  IF(WIN32)
-   SET(CMAKE_INSTALL_PREFIX C:/CreaTools/${PROJECT_NAME})
-  ENDIF(WIN32)
 
 
 #ENDIF (BUILD_BBTK_PACKAGE_creaMaracasVisu)
@@ -70,7 +112,7 @@ IF(WIN32 AND NOT UNIX)
   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)
+  SET(CPACK_NSIS_MODIFY_PATH ON)
 ELSE(WIN32 AND NOT UNIX)
 #  SET(CPACK_STRIP_FILES "bin/bbi")
   SET(CPACK_SOURCE_STRIP_FILES "")
@@ -89,11 +131,6 @@ IF (WIN32)
 ENDIF (WIN32)
 
 
-
-
-
-
-
 IF(EXWIN32)
 
 OPTION(BBTK_STANDALONE_INSTALLER "Install and add to installer all dlls needed, including from external toolkits (wx,itk,vtk)?" OFF)