*** empty log message ***

[bbtk.git] / kernel / install / cpack / CMakeLists.txt

diff --git a/kernel/install/cpack/CMakeLists.txt b/kernel/install/cpack/CMakeLists.txt
index f2bff27e685d0286ad19d479db0d6d7500132f7e..5417e12875b25801cacc86510235a5dd818efc0d 100644 (file)
--- a/kernel/install/cpack/CMakeLists.txt
+++ b/kernel/install/cpack/CMakeLists.txt
@@ -21,10 +21,16 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt")
 SET(CPACK_PACKAGE_VERSION_MAJOR ${BBTK_MAJOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_MINOR ${BBTK_MINOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_PATCH ${BBTK_BUILD_VERSION})
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\bbtk-${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}.${BBTK_BUILD_VERSION}")
-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.
+IF(WIN32)
+       SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\bbtk-${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}.${BBTK_BUILD_VERSION}")
+ELSE(WIN32)
+       SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools/bbtk-${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}.${BBTK_BUILD_VERSION}")
+ENDIF(WIN32)
+
+#SET(CPACK_SOURCE_PACKAGE_FILE_NAME "bbtk-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+IF(WIN32 AND NOT UNIX)
 #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 "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
@@ -66,7 +72,7 @@ IF(BBTK_STANDALONE_INSTALLER)
   ENDIF(USE_VTK)
     
   IF(USE_ITK)
-    INSTALL(   FILES ${ITK_DIR}/bin/ITKCommon.dll      DESTINATION bin/ )
+    INSTALL(   FILES ${ITK_DIR}/../../bin/ITKCommon.dll        DESTINATION bin/ )
   ENDIF(USE_ITK)
 
   IF(USE_WXWIDGETS)