X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=3efdb195f0be0358da54b4c7846f4840a0687a37;hb=468dd3a08b6fdc0d79e135765918701d21014d02;hp=3e14d9d71158f9232b43798980c9fe27108fa606;hpb=c0953bc3ee5159982b285fc3271799ee9a8af824;p=creaImageIO.git

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 3e14d9d..3efdb19 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -1,8 +1,4 @@
 
-
-
-
-
 #-----------------------------------------------------------------------------
 # CPACK+NSIS PACKAGING
 #-----------------------------------------------------------------------------
@@ -14,22 +10,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)
@@ -37,9 +34,9 @@ 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)
@@ -59,20 +56,19 @@ ENDIF(BUILD_STANDALONE_INSTALLER)
 
 # Aditional INSTALL for CPACK mecanism.
 IF (WIN32)
-
-  INSTALL( FILES ${PROJECT_SOURCE_DIR}/win32/sqlite3.dll DESTINATION bin ) 
-
-     
-
+  INSTALL( FILES ${PROJECT_BINARY_DIR}/RelWithDebInfo/sqlite3.dll DESTINATION bin ) 
+  INSTALL( FILES ${PROJECT_SOURCE_DIR}/win32/sqlite3.h DESTINATION include/creaImageIO2 ) 
 ENDIF (WIN32)
+
+ INSTALL( FILES ${PROJECT_SOURCE_DIR}/src2/data/localdatabase_Descriptor.dscp DESTINATION bin/Shared/gimmick )
  
 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/ )
+   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/ )
 
   #VTK dlls
   #GDCM dlls
@@ -88,13 +84,12 @@ IF (BUILD_STANDALONE_INSTALLER)
   ENDIF(USE_VTK)
     
  IF(USE_BOOST)
-	 INSTALL(   FILES   ${Boost_INCLUDE_DIR}/lib/boost_date_time-vc71-mt-1_38.dll  			DESTINATION bin/ )
-	 INSTALL(   FILES   ${Boost_INCLUDE_DIR}/lib/boost_filesystem-vc71-mt-1_38.dll  			DESTINATION bin/ )
-	 INSTALL(   FILES   ${Boost_INCLUDE_DIR}/lib/boost_iostreams-vc71-mt-1_38.dll  			DESTINATION bin/ )
-	 INSTALL(   FILES   ${Boost_INCLUDE_DIR}/lib/boost_signals-vc71-mt-1_38.dll  			DESTINATION bin/ )
-	 INSTALL(   FILES   ${Boost_INCLUDE_DIR}/lib/boost_thread-vc71-mt-1_38.dll	 			DESTINATION bin/ )
+	 INSTALL( FILES  ${Boost_INCLUDE_DIR}/lib/boost_date_time-vc71-mt-1_38.dll   DESTINATION bin/ )
+	 INSTALL( FILES  ${Boost_INCLUDE_DIR}/lib/boost_filesystem-vc71-mt-1_38.dll  DESTINATION bin/ )
+	 INSTALL( FILES  ${Boost_INCLUDE_DIR}/lib/boost_iostreams-vc71-mt-1_38.dll   DESTINATION bin/ )
+	 INSTALL( FILES  ${Boost_INCLUDE_DIR}/lib/boost_signals-vc71-mt-1_38.dll     DESTINATION bin/ )
+	 INSTALL( FILES  ${Boost_INCLUDE_DIR}/lib/boost_thread-vc71-mt-1_38.dll      DESTINATION bin/ )
  ENDIF(USE_BOOST)
-	
   
 ENDIF(WIN32)