From: guigues <guigues>
Date: Mon, 4 Feb 2008 07:31:53 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: r0.6.1~295
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=19b76ef59bb0968051d33de75d0e2a908d9bc0fd;p=bbtk.git

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

diff --git a/kernel/appli/CMakeLists.txt b/kernel/appli/CMakeLists.txt
index 51c109f..bbbb300 100644
--- a/kernel/appli/CMakeLists.txt
+++ b/kernel/appli/CMakeLists.txt
@@ -1,11 +1,12 @@
 # The BlackBox Interpreter
 SUBDIRS(bbi)
 
+# Black box code generator from xml
+SUBDIRS(bbfy)
+
 # Creates html documentation of a package
 #SUBDIRS(bbdoc)
 
-# Black box code generator from xml
-#SUBDIRS(bbfy)
 
 # Utility that creates the file architecture for a new user package 
 #SUBDIRS(bbCreatePackage)
diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index cb8d812..22d9338 100644
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -15,10 +15,10 @@ CONFIGURE_FILE(
   ${CMAKE_CURRENT_BINARY_DIR}/bb${BBTK_PACKAGE_NAME}Package.h
   @ONLY IMMEDIATE
   ) 
-INSTALL_FILES(
-  /include/bb${BBTK_PACKAGE_NAME} 
-  FILES 
-  bb${BBTK_PACKAGE_NAME}Package.h)  
+INSTALL(
+  FILES bb${BBTK_PACKAGE_NAME}Package.h
+  DESTINATION include/bb${BBTK_PACKAGE_NAME} 
+  )
 #----------------------------------------------------------------------------
   
 #----------------------------------------------------------------------------
@@ -66,9 +66,11 @@ FOREACH(xmlfile ${BBTK_PACKAGE_XML_SOURCES})
   
   GET_FILENAME_COMPONENT(filename "${xmlfile}" NAME_WE) 
   
-  #  IF(BBFY_DEPENDENCY)
-  #    SET(BBFY_DEPENDENCY_STR ${bbfy_EXECUTABLE})
-  #  ENDIF(BBFY_DEPENDENCY)
+  IF(EXISTS ${BBTK_BBFY})
+    SET(BBFY_DEPENDENCY)
+  ELSE(EXISTS ${BBTK_BBFY})
+    SET(BBFY_DEPENDENCY ${BBTK_BBFY})
+  ENDIF(EXISTS ${BBTK_BBFY})
   
   SET(BBFY_CXX_OUT ${CMAKE_CURRENT_BINARY_DIR}/${filename}.cxx)
   
@@ -77,9 +79,7 @@ FOREACH(xmlfile ${BBTK_PACKAGE_XML_SOURCES})
     COMMAND 
     ${BBTK_BBFY} ${xmlfile} ${CMAKE_CURRENT_BINARY_DIR}/ -q
     DEPENDS ${xmlfile}
-    # LG : REMOVE AUTOMATIC DEPEDENCY ON bbfy BECAUSE CAUSED ALWAYS REBUILD xml BOXES WHEN bbtk CHANGED HENCE bbfy CHANGED
-    ${BBFY_DEPENDENCY_STR} 
-    #${BBTK_BBFY} 
+    ${BBFY_DEPENDENCY} 
     )
   
   SET_SOURCE_FILES_PROPERTIES(
@@ -94,7 +94,9 @@ FOREACH(xmlfile ${BBTK_PACKAGE_XML_SOURCES})
       )
   ENDIF(NOT BBTK_PACKAGE_CXX_SOURCES MATCHES "${filename}") 
   
-  INSTALL_FILES(/include/bb${BBTK_PACKAGE_NAME} FILES ${filename}.h)  
+  INSTALL(
+    FILES       ${filename}.h 
+    DESTINATION include/bb${BBTK_PACKAGE_NAME})  
 
 ENDFOREACH(xmlfile)
 #----------------------------------------------------------------------------
@@ -115,23 +117,68 @@ TARGET_LINK_LIBRARIES(bb${BBTK_PACKAGE_NAME}
 
 #----------------------------------------------------------------------------
 # INSTALLS LIBRARY
-# NOW USES THE InstallLibrary.cmake 
+FILE(GLOB ${BBTK_PACKAGE_NAME}_HEADERS "*.h")
+INSTALL(
+  FILES ${${BBTK_PACKAGE_NAME}_HEADERS}
+  DESTINATION include/bb${BBTK_PACKAGE_NAME}
+  )  
+INSTALL(
+  TARGETS bb${BBTK_PACKAGE_NAME} 
+  DESTINATION lib)
+
+# CreateFindPackage
 SET( LIBRARY_NAME bb${BBTK_PACKAGE_NAME} )
 # SET THE LIB VERSION
 SET(${LIBRARY_NAME}_MAJOR_VERSION ${BBTK_PACKAGE_MAJOR_VERSION})
 SET(${LIBRARY_NAME}_MINOR_VERSION ${BBTK_PACKAGE_MINOR_VERSION})
 SET(${LIBRARY_NAME}_BUILD_VERSION ${BBTK_PACKAGE_BUILD_VERSION})
 # 
-#SET(INSTALL_LIBRARY_PATH ../cmake)
-# Include the file 'InstallLibrary.cmake' which does the clean install job
-#INCLUDE(${INSTALL_LIBRARY_PATH}/InstallLibrary.cmake)
-
-# OLD VERSION :
-# DEPRECATED SYNTAX BUT WHICH WORKS !!
-INSTALL_FILES(/include/bb${BBTK_PACKAGE_NAME} "\\.h$")  
-#INSTALL(FILES "$.h" DESTINATION include/${BBTK_PACKAGE_NAME})  
-INSTALL(TARGETS bb${BBTK_PACKAGE_NAME} DESTINATION lib)
-#  INSTALL_TARGETS(/lib bb${BBTK_PACKAGE_NAME})
+SET(${LIBRARY_NAME}_INSTALL_FOLDER bb${BBTK_PACKAGE_NAME})
+SET(${LIBRARY_NAME}_LIBRARIES bb${BBTK_PACKAGE_NAME})
+
+FILE(RELATIVE_PATH 
+  ${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS 
+  ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
+  )
+
+IF(UNIX)
+  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
+    ${EXECUTABLE_OUTPUT_REL_PATH})
+ELSE(UNIX)
+  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
+    ${EXECUTABLE_OUTPUT_REL_PATH}/Debug
+    ${EXECUTABLE_OUTPUT_REL_PATH}/Release)
+ENDIF(UNIX)
+SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS 
+  include/bb${BBTK_PACKAGE_NAME})
+SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
+
+# OPTIONAL 
+# - Set the version of your library
+# SET YOUR LIB VERSION
+#SET(${LIBRARY_NAME}_MAJOR_VERSION 1)
+#SET(${LIBRARY_NAME}_MINOR_VERSION 0)
+#SET(${LIBRARY_NAME}_BUILD_VERSION 0)
+# REQUIRED BUILD FLAGS
+#SET(${LIBRARY_NAME}_REQUIRED_C_FLAGS "")
+#SET(${LIBRARY_NAME}_REQUIRED_CXX_FLAGS "")
+#SET(${LIBRARY_NAME}_REQUIRED_LINK_FLAGS "")
+# ADDITIONAL CONFIG FILE
+# HERE WE USE ONE TO EXPORT testLib_EXPORTED_VALUE
+# 
+SET(${LIBRARY_NAME}_HAS_ADDITIONAL_CONFIG_FILE FALSE)
+#SET(${LIBRARY_NAME}_ADDITIONAL_CONFIG_FILE 
+#  ${PROJECT_SOURCE_DIR}/kernel/cmake/AdditionalBBTKConfig.cmake.in)
+#SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE 
+#  ${PROJECT_SOURCE_DIR}/kernel/cmake/AdditionalUseBBTK.cmake.in)
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# Includes CMakeCreateFindPackage
+INCLUDE(${CMakeCreateFindPackage_DIR}/CMakeCreateFindPackage.cmake)
+CMAKE_CREATE_FIND_PACKAGE(${LIBRARY_NAME})
+#-----------------------------------------------------------------------------
+
 #----------------------------------------------------------------------------
 
 
diff --git a/kernel/cmake/BBTKSetDeducedPaths.cmake b/kernel/cmake/BBTKSetDeducedPaths.cmake
index 30d9c4f..db5999c 100644
--- a/kernel/cmake/BBTKSetDeducedPaths.cmake
+++ b/kernel/cmake/BBTKSetDeducedPaths.cmake
@@ -27,3 +27,9 @@ SET (EXECUTABLE_OUTPUT_PATH
 SET (LIBRARY_OUTPUT_PATH    
   ${PROJECT_BINARY_DIR}/${LIBRARY_OUTPUT_REL_PATH})
 #-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# Today CMakeCreateFindPackage is copied in BBTK_CMAKE_DIR
+# When installed as a separate project will have to find it with FIND_PACKAGE
+SET(CMakeCreateFindPackage_DIR ${BBTK_CMAKE_DIR})
+#-----------------------------------------------------------------------------
diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index 48f775e..a60ee13 100644
--- a/kernel/src/CMakeLists.txt
+++ b/kernel/src/CMakeLists.txt
@@ -197,11 +197,6 @@ INSTALL(TARGETS bbtk DESTINATION lib)
 # Uses CMakeCreateFindPackage 
 #-----------------------------------------------------------------------------
 
-#-----------------------------------------------------------------------------
-# Today CMakeCreateFindPackage is copied in kernel/cmake
-# When installed as a separate project will have to find it with FIND_PACKAGE
-SET(CMakeCreateFindPackage_DIR ${PROJECT_SOURCE_DIR}/kernel/cmake)
-#-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # - Set the variable LIBRARY_NAME to the name of your library
diff --git a/packages/std/Configure.cmake b/packages/std/Configure.cmake
index 636574a..eea8ce0 100644
--- a/packages/std/Configure.cmake
+++ b/packages/std/Configure.cmake
@@ -5,6 +5,7 @@ IF(NOT BBTK_CORE_PACKAGE)
   #-------------------------------------------------------------------------
   # Find and use the Black Box Toolkit
   # Search BBTK
+  SET(FIND_PACKAGE_VERBOSE TRUE)
   FIND_PACKAGE(BBTK)
   # If bbtk found
   IF(BBTK_FOUND)
diff --git a/packages/std/doc/doxygen/DoxyMainPage.txt b/packages/std/doc/doxygen/DoxyMainPage.txt
index eb502b7..6e7e1a9 100755
--- a/packages/std/doc/doxygen/DoxyMainPage.txt
+++ b/packages/std/doc/doxygen/DoxyMainPage.txt
@@ -1,5 +1,5 @@
 /**
- * \mainpage wx package documentation
+ * \mainpage std package documentation
 
 \htmlonly 
 
diff --git a/packages/std/src/bbstdAdd.xml b/packages/std/src/bbstdAdd.xml
new file mode 100644
index 0000000..e865a8c
--- /dev/null
+++ b/packages/std/src/bbstdAdd.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<blackbox name="Add">
+
+  <author>laurent.guigues@creatis.insa-lyon.fr</author>
+  <description>Adds its inputs</description>
+
+  <parentblackbox>bbtk::UserBlackBox</parentblackbox>
+  <package>std</package>
+
+  <namespace>bbstd</namespace>
+
+  <input name="In1" type="double">First number to add</input>
+  <input name="In2" type="double">Second number to add</input>
+  <output name="Out" type="double">Result</output>
+
+  <process><PRE>
+    bbSetOutputOut( bbGetInputIn1() + bbGetInputIn2() );
+  </PRE></process>
+  
+  <constructor><PRE>
+    bbSetInputIn1(0);
+    bbSetInputIn2(0);
+    bbSetOutputOut(0);
+  </PRE></constructor>    
+
+</blackbox>
+
diff --git a/packages/wx/Configure.cmake b/packages/wx/Configure.cmake
index 636574a..eea8ce0 100644
--- a/packages/wx/Configure.cmake
+++ b/packages/wx/Configure.cmake
@@ -5,6 +5,7 @@ IF(NOT BBTK_CORE_PACKAGE)
   #-------------------------------------------------------------------------
   # Find and use the Black Box Toolkit
   # Search BBTK
+  SET(FIND_PACKAGE_VERBOSE TRUE)
   FIND_PACKAGE(BBTK)
   # If bbtk found
   IF(BBTK_FOUND)