From 122b9776f71153add372b69b194a22bda2196f96 Mon Sep 17 00:00:00 2001
From: guigues <guigues>
Date: Tue, 1 Jul 2008 11:31:23 +0000
Subject: [PATCH] *** empty log message ***

---
 kernel/cmake/AdditionalUseBBTK.cmake.in            | 2 +-
 kernel/cmake/BBTKConfigurePackage.cmake            | 3 ++-
 kernel/cmake/BBTKCreatePackageBBdoc.cmake          | 6 +++---
 kernel/cmake/bbtk_config_build.xml.in              | 3 +--
 packages/toolsbbtk/bbs/appli/GUICreateBlackBox.bbs | 6 +++++-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/kernel/cmake/AdditionalUseBBTK.cmake.in b/kernel/cmake/AdditionalUseBBTK.cmake.in
index 0aaee2c..b1ba9fc 100644
--- a/kernel/cmake/AdditionalUseBBTK.cmake.in
+++ b/kernel/cmake/AdditionalUseBBTK.cmake.in
@@ -1,7 +1,7 @@
 
 INCLUDE(${BBTK_CMAKE_DIR}/BBTKMacros.cmake)
 INCLUDE(${BBTK_CMAKE_DIR}/BBTKAddDefinitions.cmake)
-INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackagePaths.cmake)
+
 
 # If bbtk was compiled with WxWidget then have to use it
 IF(BBTK_BUILT_WITH_WX)
diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index 406b17f..e2e6fdb 100644
--- a/kernel/cmake/BBTKConfigurePackage.cmake
+++ b/kernel/cmake/BBTKConfigurePackage.cmake
@@ -3,8 +3,9 @@
 # If not a core package must include necessary cmake scripts
 IF(NOT BBTK_CORE_PACKAGE)
   #
+  INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackagePaths.cmake)
   INCLUDE(${BBTK_CMAKE_DIR}/BBTKBuildAllOption.cmake)
-  INCLUDE(${BBTK_CMAKE_DIR}/BBTKMacros.cmake)
+#  INCLUDE(${BBTK_CMAKE_DIR}/BBTKMacros.cmake)
   INCLUDE(${BBTK_CMAKE_DIR}/BBTKFindLibraries.cmake)
   #-------------------------------------------------------------------------
   # Configure bbtk_config_build.xml.in for bbi to find the bbs
diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
index be932d3..ebcee68 100644
--- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake
+++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
@@ -36,8 +36,8 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
     set(command00  Path=%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__${DOT_DIR}__RR__%PATH% )
     STRING(REPLACE "__RR__" "\;" command0 ${command00} ) 
  
-    FILE(TO_NATIVE_PATH ${BBTK_BIN_PATH}/bb${BBTK_PACKAGE_NAME}.dll  pathCommand2 )	
-    set(command1 cd "${BBTK_BIN_PATH}/../bbs/") 
+    FILE(TO_NATIVE_PATH ${EXECUTABLE_OUTPUT_PATH}/bb${BBTK_PACKAGE_NAME}.dll  pathCommand2 )	
+    set(command1 cd "${EXECUTABLE_OUTPUT_PATH}/../bbs/") 
     set(command2 copy ${pathCommand2} . )
     set(command3 ${BBTK_BBI} -N -q ${OUTPUT_FILE}) 
     set(command4 del bb${BBTK_PACKAGE_NAME}.dll)
@@ -53,7 +53,7 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
     ADD_CUSTOM_COMMAND(
       OUTPUT ${DOC_OUTPUT}
       COMMAND 
-      cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${OUTPUT_FILE} ${BBTK_MAKE_INDEX}
+      cd ${EXECUTABLE_OUTPUT_PATH} && ${BBTK_BBI} -N -q ${OUTPUT_FILE} ${BBTK_MAKE_INDEX}
       DEPENDS bb${PACKAGE_NAME} 
       )
   ENDIF(WIN32)
diff --git a/kernel/cmake/bbtk_config_build.xml.in b/kernel/cmake/bbtk_config_build.xml.in
index 4efe399..33d23ed 100644
--- a/kernel/cmake/bbtk_config_build.xml.in
+++ b/kernel/cmake/bbtk_config_build.xml.in
@@ -5,8 +5,7 @@
   <url> </url>
 #@BBTK_DOC_BUILD_PATH@ 
 
-  <bbs_path> </bbs_path>
-#@BBTK_BBS_BUILD_PATH@ 
+  <bbs_path> @BBTK_BBS_BUILD_PATH@ </bbs_path>
   <package_path> @EXECUTABLE_OUTPUT_PATH@ </package_path> 
 # For windows
   <package_path> @EXECUTABLE_OUTPUT_PATH@\Debug </package_path> 
diff --git a/packages/toolsbbtk/bbs/appli/GUICreateBlackBox.bbs b/packages/toolsbbtk/bbs/appli/GUICreateBlackBox.bbs
index 0b090ee..43ac0e4 100644
--- a/packages/toolsbbtk/bbs/appli/GUICreateBlackBox.bbs
+++ b/packages/toolsbbtk/bbs/appli/GUICreateBlackBox.bbs
@@ -155,13 +155,17 @@ new ConcatStrings concatStr
     connect authorStr.Out			concatStr.In7
     connect descriptionStr.Out		concatStr.In8
 
+/*
+LG : bug on linux 
 new ConcatStrings concatStr2
     connect  ascii.Out				concatStr2.In1 
     connect concatStr.Out			concatStr2.In2 
     connect ascii.Out				concatStr2.In3
+*/
 
 new ExecSystemCommand command
-    connect concatStr2.Out command.In
+//    connect concatStr2.Out command.In
+    connect concatStr.Out command.In
 
 exec dir
 exec main
-- 
2.45.1