From 70556b7a0f8810782f2acc875c0062d72f84acb6 Mon Sep 17 00:00:00 2001
From: guigues <guigues>
Date: Mon, 12 Jan 2009 11:04:18 +0000
Subject: [PATCH] *** empty log message ***

---
 kernel/cmake/BBTKConfigurePackage.cmake      | 2 +-
 kernel/cmake/BBTKConfigurePackagePaths.cmake | 4 +++-
 kernel/install/cpack/CMakeLists.txt          | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index a4104a4..f465a8b 100644
--- 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 f276419..8208f02 100644
--- 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 27bd6f7..9ccd620 100644
--- 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}")
-- 
2.45.1