From: guigues <guigues>
Date: Tue, 1 Apr 2008 06:41:42 +0000 (+0000)
Subject: bbc now works also from build tree
X-Git-Tag: r0.6.1~80
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a354d414b110aeb17d54f1e805441638b33464f2;p=bbtk.git

bbc now works also from build tree
---

diff --git a/kernel/appli/bbCreateBlackBox/CMakeLists.txt b/kernel/appli/bbCreateBlackBox/CMakeLists.txt
index f18afa0..0069e42 100644
--- 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 d121f00..bde1472 100644
--- 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 ac66ee3..fdf3dc7 100755
--- 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}