From: guigues <guigues>
Date: Wed, 28 Jan 2009 13:57:01 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v0.9.1~2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=98d1e0eb1df1829dc7fc7e67f5b516e2b75d2730;p=bbtk.git

*** empty log message ***
---

diff --git a/kernel/appli/bbCreateBlackBox/CMakeLists.txt b/kernel/appli/bbCreateBlackBox/CMakeLists.txt
index ad8f600..20f488c 100644
--- a/kernel/appli/bbCreateBlackBox/CMakeLists.txt
+++ b/kernel/appli/bbCreateBlackBox/CMakeLists.txt
@@ -29,6 +29,11 @@ SET(bbCreateBlackBox_DATA_REL_PATH_FROM_BIN ../${BBTK_DATA_REL_PATH}/${bbCreateB
 FILE(TO_NATIVE_PATH ${bbCreateBlackBox_DATA_REL_PATH_FROM_BIN} bbCreateBlackBox_DATA_REL_PATH_FROM_BIN)
 IF(WIN32)
   # Build tree 
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/bbCreateBlackBox.bat.in
+    ${BBTK_BINARY_DIR}/RelWithDebInfo/bbCreateBlackBox.bat
+    @ONLY IMMEDIATE
+    )
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/bbCreateBlackBox.bat.in
     ${BBTK_BINARY_DIR}/Debug/bbCreateBlackBox.bat
diff --git a/kernel/appli/bbCreatePackage/CMakeLists.txt b/kernel/appli/bbCreatePackage/CMakeLists.txt
index d31261a..cdadec6 100644
--- a/kernel/appli/bbCreatePackage/CMakeLists.txt
+++ b/kernel/appli/bbCreatePackage/CMakeLists.txt
@@ -40,6 +40,11 @@ FILE(TO_NATIVE_PATH ${bbCreatePackage_DATA_REL_PATH_FROM_BIN} bbCreatePackage_DA
 
 IF(WIN32)
   # Build tree 
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/bbCreatePackage.bat.in
+    ${BBTK_BINARY_DIR}/RelWithDebInfo/bbCreatePackage.bat
+    @ONLY IMMEDIATE
+    )
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/bbCreatePackage.bat.in
     ${BBTK_BINARY_DIR}/Debug/bbCreatePackage.bat
diff --git a/kernel/appli/bbCreatePackage/void-Package/CMakeLists.txt b/kernel/appli/bbCreatePackage/void-Package/CMakeLists.txt
index 4ec677d..67c4300 100644
--- a/kernel/appli/bbCreatePackage/void-Package/CMakeLists.txt
+++ b/kernel/appli/bbCreatePackage/void-Package/CMakeLists.txt
@@ -1,3 +1,5 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+
 #===========================================================================
 # CMAKE SETTINGS FOR BUILDING A BBTK PACKAGE
 #===========================================================================
diff --git a/kernel/appli/bbPostInstallPackage/CMakeLists.txt b/kernel/appli/bbPostInstallPackage/CMakeLists.txt
index 9a54dfb..8d6f2dd 100644
--- a/kernel/appli/bbPostInstallPackage/CMakeLists.txt
+++ b/kernel/appli/bbPostInstallPackage/CMakeLists.txt
@@ -5,6 +5,11 @@
 
 IF(WIN32)
   # Build tree 
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/bbPostInstallPackage.bat.in
+    ${BBTK_BINARY_DIR}/RelWithDebInfo/bbPostInstallPackage.bat
+    @ONLY IMMEDIATE
+    )
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/bbPostInstallPackage.bat.in
     ${BBTK_BINARY_DIR}/Debug/bbPostInstallPackage.bat
diff --git a/kernel/cmake/AdditionalBBTKConfig.cmake.in b/kernel/cmake/AdditionalBBTKConfig.cmake.in
index 37c5279..ed1f408 100644
--- a/kernel/cmake/AdditionalBBTKConfig.cmake.in
+++ b/kernel/cmake/AdditionalBBTKConfig.cmake.in
@@ -40,7 +40,7 @@ ENDIF(NOT crea_FOUND)
 
 
 # If bbtk was compiled with WxWidget then have to find it
-IF(BBTK_BUILT_WITH_WX)
-  INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseWxWidgets.cmake)
-  CREA_FIND_WXWIDGETS()
-ENDIF(BBTK_BUILT_WITH_WX)
+#IF(BBTK_BUILT_WITH_WX)
+#  INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseWxWidgets.cmake)
+#  CREA_FIND_WXWIDGETS()
+#ENDIF(BBTK_BUILT_WITH_WX)
diff --git a/kernel/cmake/AdditionalUseBBTK.cmake.in b/kernel/cmake/AdditionalUseBBTK.cmake.in
index b5da596..faa74c1 100644
--- a/kernel/cmake/AdditionalUseBBTK.cmake.in
+++ b/kernel/cmake/AdditionalUseBBTK.cmake.in
@@ -4,7 +4,7 @@ INCLUDE(${BBTK_CMAKE_DIR}/BBTKAddDefinitions.cmake)
 
 
 # If bbtk was compiled with WxWidget then have to use it
-IF(BBTK_BUILT_WITH_WX)
-  CREA_USE_WXWIDGETS()
-ENDIF(BBTK_BUILT_WITH_WX)
+#IF(BBTK_BUILT_WITH_WX)
+#  CREA_USE_WXWIDGETS()
+#ENDIF(BBTK_BUILT_WITH_WX)
 
diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index 3b089aa..023c175 100644
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -19,6 +19,8 @@ ENDIF(crea_FOUND)
 
 #-----------------------------------------------------------------------------
 # USE SHIPPED BOOST ?
+IF(BBTK_CORE_PACKAGE)
+
 IF(BBTK_USE_SHIPPED_BOOST)
   MESSAGE ( STATUS "=======================================")
   MESSAGE(STATUS "bbtk uses shipped boost C++ library (${BBTK_SHIPPED_BOOST})")
@@ -37,6 +39,8 @@ ELSE(BBTK_USE_SHIPPED_BOOST)
     boost_signals
     )
 ENDIF(BBTK_USE_SHIPPED_BOOST)
+
+ENDIF(BBTK_CORE_PACKAGE)
 #-----------------------------------------------------------------------------