bbc now works also from build tree

diff --git a/kernel/appli/bbCreateBlackBox/CMakeLists.txt b/kernel/appli/bbCreateBlackBox/CMakeLists.txt
index f18afa0528bf0aeeb5bdcbda48d3a2075e30426c..0069e4294ab4774213d9cca6f13cb410e83f3105 100644 (file)
--- a/kernel/appli/bbCreateBlackBox/CMakeLists.txt
+++ b/kernel/appli/bbCreateBlackBox/CMakeLists.txt
@@ -58,6 +58,7 @@ IF(UNIX)
   INSTALL(
     PROGRAMS ${BBTK_BINARY_DIR}/bin/bbCreateBlackBox
     DESTINATION bin
+    PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE
     )
 ENDIF(UNIX)
 

diff --git a/kernel/appli/bbc/CMakeLists.txt b/kernel/appli/bbc/CMakeLists.txt
index d121f00014441691ddec3f535f1da087f2ab4fcb..bde14722f9a2af177659e34d5e491417b0a2be4a 100644 (file)
--- a/kernel/appli/bbc/CMakeLists.txt
+++ b/kernel/appli/bbc/CMakeLists.txt
@@ -3,8 +3,11 @@ SET(bbc_DATA_REL_PATH_FROM_DATA kernel/bbc)
 # Relative path to the data used by bbc from bin folder
 SET(bbc_DATA_REL_PATH_FROM_BIN ../${BBTK_DATA_REL_PATH}/${bbc_DATA_REL_PATH_FROM_DATA})
 
+
+
 IF(UNIX)
   # Build tree 
+  SET(bbc_CMAKE_OPTION_FOR_BUILD_TREE "-DBBTK_DIR=${PROJECT_BINARY_DIR}")
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/main.cxx.in
     ${BBTK_DATA_BUILD_PATH}/${bbc_DATA_REL_PATH_FROM_DATA}/main.cxx.in
@@ -21,12 +24,18 @@ IF(UNIX)
     @ONLY IMMEDIATE
     )
   # Install tree
+  SET(bbc_CMAKE_OPTION_FOR_BUILD_TREE "")
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/bbc.sh.in
+    ${CMAKE_CURRENT_BINARY_DIR}/bbc
+    @ONLY IMMEDIATE
+    )
   INSTALL(
     FILES ${CMAKE_CURRENT_SOURCE_DIR}/main.cxx.in ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt.in
     DESTINATION ${BBTK_DATA_INSTALL_PATH}/${bbc_DATA_REL_PATH_FROM_DATA}
     )
   INSTALL(
-    PROGRAMS ${BBTK_BINARY_DIR}/bin/bbc
+    PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bbc
     DESTINATION bin
     )
     

diff --git a/kernel/appli/bbc/bbc.sh.in b/kernel/appli/bbc/bbc.sh.in
index ac66ee394a60e7e89fe94cae165ed1208b6bd2e2..fdf3dc70373f99ce9d9f32fddddc048ce5639ff3 100755 (executable)
--- a/kernel/appli/bbc/bbc.sh.in
+++ b/kernel/appli/bbc/bbc.sh.in
@@ -32,8 +32,8 @@ mkdir ${WORKDIR}
 sed s,OUTPUT,${OUTPUT},g ${DATADIR}/CMakeLists.txt.in > ${WORKDIR}/CMakeLists.txt
 sed s,EXEC_FUNCTION,${EXEC_FUNCTION},g ${DATADIR}/main.cxx.in > ${WORKDIR}/main.cxx
 cd ${WORKDIR}
-bbs2cpp ${IN} > log.txt 
-cmake . > log.txt 
+${BINPATH}/bbs2cpp ${IN} > log.txt 
+cmake . @bbc_CMAKE_OPTION_FOR_BUILD_TREE@ > log.txt 
 make > log.txt
 mv ${OUTPUT} ${CUR}/
 cd ${CUR}