X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fcmake%2FBBTKConfigurePackage_src.cmake;h=ab6cfbd0a6f6e5f8847b176e6f5299bbf1ecfa04;hb=0897431b13703ae395668c853d9932982bad55bf;hp=43179eaa08845d6cbb681b10549613234706e98d;hpb=a26195c366a89795288009cf7e20f11afa494970;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index 43179ea..ab6cfbd 100644
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -15,7 +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(
+  /include/bb${BBTK_PACKAGE_NAME} 
+  FILES 
+  bb${BBTK_PACKAGE_NAME}Package.h)  
 #----------------------------------------------------------------------------
   
 #----------------------------------------------------------------------------
@@ -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}
   )
 #----------------------------------------------------------------------------