X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=kernel%2Fcmake%2FBBTKConfigurePackage_src.cmake;h=79a44e02034a0a631bd5a3da7bd116de37a41efb;hb=6bbabb32cba07ce95376c2cdcb804ee97050d453;hp=d447c987e86afe8eca2ba8d702b650c3a2df1626;hpb=eed4a68ed3d379b6d3060e7a3730d12fa806b1ed;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index d447c98..79a44e0 100644
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -8,11 +8,6 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} )
 #----------------------------------------------------------------------------
 
-#----------------------------------------------------------------------------
-# USER DEFINED ADDITIONAL INCLUDE DIRS
-# NB : PATHS PROVIDED BY THE USER ARE RELATIVE TO THE PARENT DIR 
-INCLUDE_DIRECTORIES(../${${BBTK_PACKAGE_NAME}_INCLUDE_DIRS})
-#----------------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------------
@@ -78,33 +73,40 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
   SET(BBFY_CXX_OUT ${CMAKE_CURRENT_BINARY_DIR}/${filename}.cxx)
   
   IF (WIN32)
-    SET(command00  Path=%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH% )
-    STRING(REPLACE "__RR__" "\;" command0 ${command00} )
-    SET(SETPATH "set ${command0} &&")
+    SET(command00 Path=%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH%)
+    STRING(REPLACE "__RR__" "\;" SETPATH ${command00} )
+	#    SET(SETPATH set ${command0} &&)
+ ADD_CUSTOM_COMMAND(
+    OUTPUT ${BBFY_CXX_OUT}
+    COMMAND
+    set ${SETPATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
+    DEPENDS ${xmlfile}
+    ${BBTK_BBFY_DEPENDENCY} 
+    )
   ELSE(WIN32)
-    SET(SETPATH "")
-  ENDIF(WIN32)
-  
-  ADD_CUSTOM_COMMAND(
+ ADD_CUSTOM_COMMAND(
     OUTPUT ${BBFY_CXX_OUT}
     COMMAND
-    ${SETPATH} ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
+    ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
     DEPENDS ${xmlfile}
     ${BBTK_BBFY_DEPENDENCY} 
     )
+
+	ENDIF(WIN32)
   
+   
   SET_SOURCE_FILES_PROPERTIES(
     ${BBFY_CXX_OUT}
     PROPERTIES GENERATED ON)
   
   
- #  IF(NOT ${BBTK_PACKAGE_NAME}_CXX_SOURCES MATCHES "${filename}")
+ IF(NOT ${BBTK_PACKAGE_NAME}_CXX_SOURCES MATCHES "${filename}.cxx")
  # message ("EED Alert BBTKConfigurePackage_src  "  "IF NOT MATCHES" )
   SET(${BBTK_PACKAGE_NAME}_CXX_SOURCES
       ${${BBTK_PACKAGE_NAME}_CXX_SOURCES}
-      ${filename}
+      ${filename}.cxx
       )
-#  ENDIF(NOT ${BBTK_PACKAGE_NAME}_CXX_SOURCES MATCHES "${filename}") 
+ ENDIF(NOT ${BBTK_PACKAGE_NAME}_CXX_SOURCES MATCHES "${filename}.cxx") 
   
   INSTALL(
     FILES       ${CMAKE_CURRENT_BINARY_DIR}/${filename}.h