X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=465d34dde3746c5f7612a3331bbcde7ac998de5e;hb=bae8afe7ee037a3368be7060c3a0708582e7d413;hp=7b430a53e38a62a967de6a85527f3dd56c156a42;hpb=887231b4fcb3ab4d183936211a764d8a27e07e42;p=creaImageIO.git

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 7b430a5..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
@@ -10,19 +34,23 @@
 
 INCLUDE(InstallRequiredSystemLibraries)
 
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "creaImageIO - 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})
 SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION})
 
+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)
 
-  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaImageIO-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-  IF(WIN32)
-    SET(CMAKE_INSTALL_PREFIX ${CPACK_PACKAGE_INSTALL_DIRECTORY})
-  ENDIF(WIN32)
+IF(WIN32)
+	SET(CMAKE_INSTALL_PREFIX C:/CreaTools/${PROJECT_NAME})
+ENDIF(WIN32)
 
 
 IF(WIN32 AND NOT UNIX)
@@ -30,16 +58,16 @@ 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 "creaImageIO")
-  SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/creatools/creaImageIO")
-  SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr/creatools/creaImageIO")
+  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)
 #  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)
@@ -49,21 +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_SOURCE_DIR}/win32/sqlite3.dll DESTINATION bin ) 
+  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.txt 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