]> Creatis software - bbtk.git/commitdiff
*** empty log message ***
authorguigues <guigues>
Tue, 13 May 2008 09:04:54 +0000 (09:04 +0000)
committerguigues <guigues>
Tue, 13 May 2008 09:04:54 +0000 (09:04 +0000)
kernel/appli/bbc/CMakeLists.txt
kernel/appli/bbc/bbc.sh.in
kernel/appli/bbc/main.cxx.in
kernel/cmake/BBTKConfigurePackage_bbs.cmake
kernel/src/CMakeLists.txt
kernel/src/bbtkAtomicBlackBoxDescriptor.cxx

index c2e8202fdb072caf57664fb38290b2afad72cb64..0ee3cb18b68cbe454aa5c0e0e74864f0795958ad 100644 (file)
@@ -17,6 +17,30 @@ CONFIGURE_FILE(
   ${BBTK_DATA_BUILD_PATH}/${bbc_DATA_REL_PATH_FROM_DATA}/CMakeLists.txt.in
   COPYONLY
 )
+IF(UNIX)
+       CONFIGURE_FILE(
+               ${CMAKE_CURRENT_SOURCE_DIR}/bbc.sh.in
+               ${BBTK_BINARY_DIR}/bin/bbc
+               @ONLY IMMEDIATE
+       )    
+       INSTALL(
+               PROGRAMS ${BBTK_BINARY_DIR}/bin/bbc
+               DESTINATION bin
+       )
+ELSE(UNIX)
+       CONFIGURE_FILE(
+               ${CMAKE_CURRENT_SOURCE_DIR}/bbc.bat.in
+               ${CMAKE_CURRENT_BINARY_DIR}/bbc.bat
+               @ONLY IMMEDIATE
+       )    
+       INSTALL(
+               PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bbc.bat
+               DESTINATION bin
+       )
+ENDIF(UNIX)
+
+
+
 
 # Install tree
 SET(bbc_CMAKE_OPTION_FOR_BUILD_TREE "")
index fdf3dc70373f99ce9d9f32fddddc048ce5639ff3..f0f4373bef15ada500f06f29558199eba3796237 100755 (executable)
@@ -18,6 +18,8 @@ BINPATH=$(echo ${TMP#*/}|rev)
 # data path
 DATADIR=${BINPATH}/@bbc_DATA_REL_PATH_FROM_BIN@
 
+#echo ****** BBC : ${BINPATH}
+
 # extract bbs file name
 IN=$1
 TMP="${IN##*/}"
@@ -34,6 +36,8 @@ sed s,EXEC_FUNCTION,${EXEC_FUNCTION},g ${DATADIR}/main.cxx.in > ${WORKDIR}/main.
 cd ${WORKDIR}
 ${BINPATH}/bbs2cpp ${IN} > log.txt 
 cmake . @bbc_CMAKE_OPTION_FOR_BUILD_TREE@ > log.txt 
+#-DFIND_PACKAGE_VERBOSE=1
+#
 make > log.txt
 mv ${OUTPUT} ${CUR}/
 cd ${CUR}
index 119862a13113d01450130d4b7361f1df6cdd0e74..d1d8212b4326ff3d41c83773230e3d4e4a4faa70 100644 (file)
@@ -107,8 +107,9 @@ bool wxBBIApp::OnInit( )
   
   if (quiet) bbtk::MessageManager::SetMessageLevel("max",0);
   if (debug) bbtk::MessageManager::SetMessageLevel("all",9);
-  
-  bbtk::Wx::CreateInvisibleTopWindow();
+  // Creates the parent window of all bbtk windows 
+  bbtk::Wx::CreateTopWindow();
 
   try {
     mExecuter = bbtk::Executer::New();
index 88bbdfab58263ff0be93932d35d89f435bd4f004..17c24d4becee9aeba26777590e2112ef556a780f 100644 (file)
@@ -61,7 +61,7 @@ IF (BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_BBS_APP)
     GET_FILENAME_COMPONENT(name "${bbs}" NAME_WE) 
     SET(OUTPUT bb${name})
     ADD_CUSTOM_COMMAND(
-      OUTPUT ${BBTK_BIN_PATH}xxx/${OUTPUT}
+      OUTPUT ${BBTK_BIN_PATH}/${OUTPUT}
       COMMAND 
       cd ${BBTK_BIN_PATH} && ${BBTK_BBC} ${BBTK_PACKAGE_NAME}/appli/${name}
       DEPENDS ${bbs}
index e3b5e43e90f22f6406164fe8b4560c31abe1d193..c5ecded0094885cb9df369baf459fa79d303d2a7 100644 (file)
@@ -223,6 +223,12 @@ SET(LIBRARY_NAME BBTK)
 SET(${LIBRARY_NAME}_INSTALL_FOLDER bbtk)
 SET(${LIBRARY_NAME}_LIBRARIES bbtk)
 SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS kernel/src kernel/src/ThirdParty)
+IF(BBTK_USE_SHIPPED_BOOST)
+  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
+    ${${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS} 
+    kernel/src/ThirdParty/${BBTK_SHIPPED_BOOST}
+    )
+ENDIF(BBTK_USE_SHIPPED_BOOST)
 IF(UNIX)
   SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
     ${EXECUTABLE_OUTPUT_REL_PATH})
index 6511313b3bcf4c7f10cd29885e0671b8337ac4a2..ea1a10d9fc97476103355c1ddeba3bff97ca8a31 100644 (file)
@@ -24,7 +24,7 @@ namespace bbtk
        (typeid(AtomicBlackBoxDescriptor),
        "BoxExecute",
        "Any signal received by this input executes the box",
-       "",
+       "signal",
        new bbtk::AtomicBlackBoxTGetFunctor<BlackBox,Void,Void>(&BlackBox::bbGetInputBoxExecute), 
        new bbtk::AtomicBlackBoxTSetFunctor<BlackBox,Void,Void>(&BlackBox::bbSetInputBoxExecute) ) );
     // Creates the output 'BoxChange'      
@@ -33,8 +33,8 @@ namespace bbtk
        bbtk::AtomicBlackBoxOutputDescriptor
        (typeid(AtomicBlackBoxDescriptor),
        "BoxChange",
-       "Signal modifications of the box", 
-       "",
+       "Signals modifications of the box", 
+       "signal",
        new bbtk::AtomicBlackBoxTGetFunctor<BlackBox,Void,Void>(&BlackBox::bbGetOutputBoxChange), 
        new bbtk::AtomicBlackBoxTSetFunctor<BlackBox,Void,Void>(&BlackBox::bbSetOutputBoxChange) ) );
     //