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

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 16fbe53..2f33f2c 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -27,17 +27,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 +71,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 +86,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 "")