X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=f3b2af04ce0e9c397f24390c6c6fa1feaad250dc;hb=a31d25701d89e531bf4126997b4a63975b1ee4d4;hp=efc6c0e22e717ee38ffa8151a07183a0befb943a;hpb=558552a636fe8354ae26f11ffc0118d38728e3b8;p=creaImageIO.git

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index efc6c0e..f3b2af0 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -1,9 +1,6 @@
 
 
 
-IF(WIN32)
-  SET(CMAKE_INSTALL_PREFIX C:/CreaTools/creaImageIO)
-ENDIF(WIN32)
 
 
 #-----------------------------------------------------------------------------
@@ -26,7 +23,31 @@ SET(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_MAJOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION})
 
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaImageIO-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+
+
+#SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaImageIO-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+
+
+
+#IF (BUILD_BBTK_PACKAGE_creaImageIO)
+#
+#  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\bbtk-${BBTK_VERSION}")
+#  IF(WIN32)
+#    SET(CMAKE_INSTALL_PREFIX C:/CreaTools/bbtk-${BBTK_VERSION})
+#  ENDIF(WIN32)
+
+#ELSE (BUILD_BBTK_PACKAGE_creaImageIO)
+
+  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 C:/CreaTools/creaImageIO)
+  ENDIF(WIN32)
+
+
+#ENDIF (BUILD_BBTK_PACKAGE_creaImageIO)
+
+
+
 IF(WIN32 AND NOT UNIX)
   # There is a bug in NSI that does not handle full unix paths properly. Make
   # sure there is at least one set of four (4) backlasshes.
@@ -41,13 +62,24 @@ 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 "TestWxGimmickDialog.exe" "Gimmick!")
+SET(CPACK_PACKAGE_EXECUTABLES "TestWxGimmickDialog" "Gimmick!")
   
 
 INCLUDE(CPack)
 
 
 # Aditional INSTALL for CPACK mecanism.
+IF (WIN32)
+
+  INSTALL( FILES ${PROJECT_SOURCE_DIR}/win32/sqlite3.dll DESTINATION bin ) 
+
+ENDIF (WIN32)
+
+
+
+
+
+
 
 IF(EXWIN32)