X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=59a73484cfc1cf72fabcc154dbe3c2b2e6d6dc32;hb=2d22fa23fd7ef07a7bfcb586a81fd6fb31ec0ca5;hp=8e179f246642ea3fef052a0cec68f2f937b4ae1f;hpb=60067c5195c2aff6e7de8faef1cecf25f32802e4;p=creaImageIO.git

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 8e179f2..59a7348 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -1,8 +1,4 @@
 
-
-
-
-
 #-----------------------------------------------------------------------------
 # CPACK+NSIS PACKAGING
 #-----------------------------------------------------------------------------
@@ -22,14 +18,15 @@ 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\\\\creaImageIO-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+ELSE(WIN32)
+	SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools/creaImageIO-${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/creaImageIO)
+ENDIF(WIN32)
 
 
 IF(WIN32 AND NOT UNIX)
@@ -59,11 +56,8 @@ ENDIF(BUILD_STANDALONE_INSTALLER)
 
 # Aditional INSTALL for CPACK mecanism.
 IF (WIN32)
-
   INSTALL( FILES ${PROJECT_SOURCE_DIR}/win32/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.txt DESTINATION bin/Shared/gimmick )
@@ -71,10 +65,10 @@ ENDIF (WIN32)
 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
@@ -90,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)