*** empty log message ***

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index a4104a446834cc8e110386b5aa812d1f904a57cc..f465a8bf03c4764cd35020bfe4a28c090666b79a 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage.cmake
+++ b/kernel/cmake/BBTKConfigurePackage.cmake
@@ -39,7 +39,7 @@ IF(NOT BBTK_CORE_PACKAGE)
     )
   IF (WIN32)
     INSTALL ( FILES ${${BBTK_PACKAGE_NAME}_BINARY_DIR}/bbtkPackage
-      DESTINATION "" )
+      DESTINATION "." )
   ENDIF (WIN32)
   #---------------------------------------------------------------------------
 ELSE(NOT BBTK_CORE_PACKAGE)

diff --git a/kernel/cmake/BBTKConfigurePackagePaths.cmake b/kernel/cmake/BBTKConfigurePackagePaths.cmake
index f2764198fe776c511b274ab97f60779a8e5655c7..8208f0280cac1f39e6540f1df36fc4a9640da295 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackagePaths.cmake
+++ b/kernel/cmake/BBTKConfigurePackagePaths.cmake
@@ -11,7 +11,9 @@ IF(WIN32)
   IF(NOT BBTK_BIN_PATH)
     MESSAGE(FATAL_ERROR "bbi not found in ${BBTK_DIR}/bin ; ${BBTK_DIR}/Release ; ${BBTK_DIR}/Debug : is bbtk properly built ?")  
   ENDIF(NOT BBTK_BIN_PATH)
-       
+
+  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")
+
   SET(BBTK_PACKAGE_LIB_PATH bin)
   SET(BBTK_BBI "${BBTK_BIN_PATH}/bbi")
   SET(BBTK_BBS2CPP "${BBTK_BIN_PATH}/bbs2cpp")

diff --git a/kernel/install/cpack/CMakeLists.txt b/kernel/install/cpack/CMakeLists.txt
index 27bd6f71415197a384e661a5111d7e958178bfab..9ccd62079b39462dc4689dd6583ab618bba7b229 100644 (file)
--- a/kernel/install/cpack/CMakeLists.txt
+++ b/kernel/install/cpack/CMakeLists.txt
@@ -21,10 +21,11 @@ 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.
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\bbtk-${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}.${BBTK_BUILD_VERSION}")
+#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}")