*** empty log message ***

[bbtk.git] / kernel / cmake / BBTKConfigurePackage_src.cmake

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index 43179eaa08845d6cbb681b10549613234706e98d..cb8d812362d8cc5b905c4393339e75cc342b85ce 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -11,17 +11,20 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} )
 #----------------------------------------------------------------------------
 # CREATES bb${BBTK_PACKAGE_NAME}Package.h
 CONFIGURE_FILE(
-  ${BBTK_DIR}/bbPackage.h.in
+  ${BBTK_CMAKE_DIR}/bbPackage.h.in
   ${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(
+  /include/bb${BBTK_PACKAGE_NAME} 
+  FILES 
+  bb${BBTK_PACKAGE_NAME}Package.h)  
 #----------------------------------------------------------------------------
   
 #----------------------------------------------------------------------------
 # CREATES bb${BBTK_PACKAGE_NAME}Package.cxx
 CONFIGURE_FILE(
-  ${BBTK_DIR}/bbPackage.cxx.in
+  ${BBTK_CMAKE_DIR}/bbPackage.cxx.in
   ${CMAKE_CURRENT_BINARY_DIR}/bb${BBTK_PACKAGE_NAME}Package.cxx
   @ONLY IMMEDIATE
   )
@@ -63,26 +66,20 @@ FOREACH(xmlfile ${BBTK_PACKAGE_XML_SOURCES})
   
   GET_FILENAME_COMPONENT(filename "${xmlfile}" NAME_WE) 
   
-  IF(WIN32)
-    SET(bbfy_EXECUTABLE $(TargetDir)/bbfy.exe)
-  ELSE(WIN32)
-    SET(bbfy_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/bbfy)
-  ENDIF(WIN32)      
-  
-  IF(BBFY_DEPENDENCY)
-    SET(BBFY_DEPENDENCY_STR ${bbfy_EXECUTABLE})
-  ENDIF(BBFY_DEPENDENCY)
+  #  IF(BBFY_DEPENDENCY)
+  #    SET(BBFY_DEPENDENCY_STR ${bbfy_EXECUTABLE})
+  #  ENDIF(BBFY_DEPENDENCY)
   
   SET(BBFY_CXX_OUT ${CMAKE_CURRENT_BINARY_DIR}/${filename}.cxx)
   
   ADD_CUSTOM_COMMAND(
     OUTPUT ${BBFY_CXX_OUT}
     COMMAND 
-    ${bbfy_EXECUTABLE} ${xmlfile} ${CMAKE_CURRENT_BINARY_DIR}/ -q
+    ${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} 
-    #${bbfy_EXECUTABLE} 
+    #${BBTK_BBFY} 
     )
   
   SET_SOURCE_FILES_PROPERTIES(
@@ -98,6 +95,7 @@ FOREACH(xmlfile ${BBTK_PACKAGE_XML_SOURCES})
   ENDIF(NOT BBTK_PACKAGE_CXX_SOURCES MATCHES "${filename}") 
   
   INSTALL_FILES(/include/bb${BBTK_PACKAGE_NAME} FILES ${filename}.h)  
+
 ENDFOREACH(xmlfile)
 #----------------------------------------------------------------------------
 
@@ -110,7 +108,6 @@ ADD_LIBRARY(bb${BBTK_PACKAGE_NAME} SHARED
   )
 TARGET_LINK_LIBRARIES(bb${BBTK_PACKAGE_NAME} 
   bbtk
-  #  ${BBP_LINK_LIBRARIES} 
   ${BBTK_PACKAGE_LIBS}
   )
 #----------------------------------------------------------------------------