X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=465d34dde3746c5f7612a3331bbcde7ac998de5e;hb=7a7557d18e0cd9551a5d0abc3de53e811f11f76e;hp=3efdb195f0be0358da54b4c7846f4840a0687a37;hpb=66b6e0ff572cd5002f4baba4c12e2451a752df3d;p=creaImageIO.git

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 3efdb19..465d34d 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -1,3 +1,27 @@
+# ---------------------------------------------------------------------
+#
+# 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
@@ -43,7 +67,7 @@ ELSE(WIN32 AND NOT UNIX)
 #  SET(CPACK_STRIP_FILES "bin/bbi")
   SET(CPACK_SOURCE_STRIP_FILES "")
 ENDIF(WIN32 AND NOT UNIX)
-SET(CPACK_PACKAGE_EXECUTABLES "TestWxGimmickReaderDialog" "TestWxGimmickReaderDialog")
+SET(CPACK_PACKAGE_EXECUTABLES "creaImageIOApp" "creaImageIOApp")
   
 
 INCLUDE(CPack)
@@ -53,22 +77,32 @@ IF(BUILD_STANDALONE_INSTALLER)
   SET (ADDITIONAL_DLL_PATH "C:/Program Files/CreaTools/crea_ThirdParty_dlls-0.2.0/bin" CACHE PATH "Additional paths in which to look for dlls")
 ENDIF(BUILD_STANDALONE_INSTALLER)
 
+##EED 04juin2013
+##EED # Aditional INSTALL for CPACK mecanism.
+##EED IF (WIN32)
+##EED   INSTALL( FILES ${PROJECT_BINARY_DIR}/RelWithDebInfo/sqlite3.dll DESTINATION bin ) 
+##EED   INSTALL( FILES ${PROJECT_SOURCE_DIR}/win32/sqlite3.h DESTINATION include/creaImageIO ) 
+##EED ENDIF (WIN32)
+
+
+#-- share/creaImageIO --
 
-# Aditional INSTALL for CPACK mecanism.
 IF (WIN32)
-  INSTALL( FILES ${PROJECT_BINARY_DIR}/RelWithDebInfo/sqlite3.dll DESTINATION bin ) 
-  INSTALL( FILES ${PROJECT_SOURCE_DIR}/win32/sqlite3.h DESTINATION include/creaImageIO2 ) 
+  SET(INSTALL_DATA_DIR "bin/share/creaImageIO")
+ELSE (WIN32)
+  SET(INSTALL_DATA_DIR "share/creaImageIO/")
 ENDIF (WIN32)
-
- INSTALL( FILES ${PROJECT_SOURCE_DIR}/src2/data/localdatabase_Descriptor.dscp DESTINATION bin/Shared/gimmick )
+INSTALL( FILES ${PROJECT_SOURCE_DIR}/src/data/localdatabase_Descriptor.dscp DESTINATION ${INSTALL_DATA_DIR} )
  
+
+
 IF (BUILD_STANDALONE_INSTALLER)
 
   IF(WIN32)
    INSTALL( FILES ${SYSTEMROOT}/system32/msvcp71d.dll                     DESTINATION bin/ )
    INSTALL( FILES ${SYSTEMROOT}/system32/msvcr71d.dll                     DESTINATION bin/ )
    INSTALL( FILES ${PROJECT_BINARY_DIR}/relwithdebinfo//crea.dll          DESTINATION bin/ )
-   INSTALL( FILES ${PROJECT_BINARY_DIR}/relwithdebinfo//sqlite3.dll       DESTINATION bin/ )
+##EED    INSTALL( FILES ${PROJECT_BINARY_DIR}/relwithdebinfo//sqlite3.dll       DESTINATION bin/ )
 
   #VTK dlls
   #GDCM dlls