X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=5289b7a7b5156e23f93aefc65a1c55130873e554;hb=2a1cde86bf45b8f9b11514a9b04d5834b10af209;hp=4a98afd2d07eba41583a415f928c621825da03e5;hpb=5d4b27c204ef956634a4d97562a75756dd99a0c1;p=creaMaracasVisu.git

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 4a98afd..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,23 +53,33 @@ FOREACH( iLST  ${DATA_FILES} )
    )
 ENDFOREACH(iLST)
 
+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
+       DESTINATION ${INSTALL_DATA_DIR}
    )
 ENDFOREACH(iLST)
 
 
-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)
+
+## 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)
 
 
 
@@ -95,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)