*** 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 2fcd9ded4a8853293606385b2c71be745cee442e..ecc26f9818ac88976962b3536fd33d2fefeae96d 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -8,10 +8,8 @@ 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})
+
+
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
@@ -72,33 +70,48 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
   
   GET_FILENAME_COMPONENT(filename "${xmlfile}" NAME_WE) 
   
-  
   SET(BBFY_CXX_OUT ${CMAKE_CURRENT_BINARY_DIR}/${filename}.cxx)
   
-  ADD_CUSTOM_COMMAND(
+  IF (WIN32)
+    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 
-    ${BBTK_BBFY} ${xmlfile} ${CMAKE_CURRENT_BINARY_DIR}/ -q
+    COMMAND
+    set ${SETPATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
     DEPENDS ${xmlfile}
     ${BBTK_BBFY_DEPENDENCY} 
     )
+  ELSE(WIN32)
+
+ ADD_CUSTOM_COMMAND(
+    OUTPUT ${BBFY_CXX_OUT}
+    COMMAND
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && ${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}")
-    SET(${BBTK_PACKAGE_NAME}_CXX_SOURCES
+ 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 
     DESTINATION include/bb${BBTK_PACKAGE_NAME})  
-
 ENDFOREACH(xmlfile)
 #----------------------------------------------------------------------------
 
@@ -113,6 +126,7 @@ TARGET_LINK_LIBRARIES(bb${BBTK_PACKAGE_NAME}
   bbtk
   ${${BBTK_PACKAGE_NAME}_LIBS}
   )
+SET_TARGET_PROPERTIES(bb${BBTK_PACKAGE_NAME} PROPERTIES COMPILE_FLAGS -Wall)
 #----------------------------------------------------------------------------
 
 
@@ -167,11 +181,6 @@ SET(BBTK_PACKAGE_USE_GDCM ${${BBTK_PACKAGE_NAME}_USE_GDCM})
 SET(BBTK_PACKAGE_USE_GSMIS ${${BBTK_PACKAGE_NAME}_USE_GSMIS})
 SET(BBTK_PACKAGE_USE_WXWIDGETS ${${BBTK_PACKAGE_NAME}_USE_WXWIDGETS})
 SET(BBTK_PACKAGE_USE_PACKAGES  ${${BBTK_PACKAGE_NAME}_USE_PACKAGES})
-SET(BBTK_PACKAGE_AUTHOR        "\"${${BBTK_PACKAGE_NAME}_AUTHOR}\"")
-SET(BBTK_PACKAGE_DESCRIPTION   "\"${${BBTK_PACKAGE_NAME}_DESCRIPTION}\"")
-SET(BBTK_PACKAGE_MAJOR_VERSION ${${BBTK_PACKAGE_NAME}_MAJOR_VERSION})
-SET(BBTK_PACKAGE_MINOR_VERSION ${${BBTK_PACKAGE_NAME}_MINOR_VERSION})
-SET(BBTK_PACKAGE_BUILD_VERSION ${${BBTK_PACKAGE_NAME}_BUILD_VERSION})
 SET(BBTK_PACKAGE_INCLUDE_DIRS  ${${BBTK_PACKAGE_NAME}_INCLUDE_DIRS})
 SET(BBTK_PACKAGE_LIBS          ${${BBTK_PACKAGE_NAME}_LIBS})