X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage_src.cmake;h=494d9ffb60cdd13721e96c930aeaeddcd5ba5ee2;hb=7785d9f3ee33f106ad64a204d8cef883185180b0;hp=2940f82957eea00c355f04b93be1c1454d08db8b;hpb=f303df63e2a2e33d698c974858f288058d980ae4;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index 2940f82..494d9ff 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})
-#----------------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------------
@@ -49,15 +44,16 @@ SET_SOURCE_FILES_PROPERTIES(
 #----------------------------------------------------------------------------
 IF(${BBTK_PACKAGE_NAME}_COMPILE_ALL_CXX) 
   FILE(GLOB ${BBTK_PACKAGE_NAME}_CXX_SOURCES "." "*.cxx")
+  FILE(GLOB ${BBTK_PACKAGE_NAME}_CPP_SOURCES "." "*.cpp")
+  SET(${BBTK_PACKAGE_NAME}_CXX_SOURCES ${${BBTK_PACKAGE_NAME}_CXX_SOURCES} ${${BBTK_PACKAGE_NAME}_CPP_SOURCES})
   FILE(GLOB ${BBTK_PACKAGE_NAME}_H_SOURCES "." "*.h")
 ENDIF(${BBTK_PACKAGE_NAME}_COMPILE_ALL_CXX) 
-
-
-SET(${BBTK_PACKAGE_NAME}_CXX_SOURCES
-  ${${BBTK_PACKAGE_NAME}_CXX_SOURCES}
-  #${CMAKE_CURRENT_BINARY_DIR_NAME}/
-  bb${BBTK_PACKAGE_NAME}Package
-  )
+IF(NOT PROJECT_BINARY_DIR STREQUAL ${PROJECT_SOURCE_DIR})
+  SET(${BBTK_PACKAGE_NAME}_CXX_SOURCES
+    ${${BBTK_PACKAGE_NAME}_CXX_SOURCES}
+    bb${BBTK_PACKAGE_NAME}Package
+    )
+ENDIF(NOT PROJECT_BINARY_DIR STREQUAL ${PROJECT_SOURCE_DIR})
 #----------------------------------------------------------------------------
 
 
@@ -75,33 +71,49 @@ 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)
+    MAKE_DLL_PATH()
+ #   SET(command00 Path=c:/creatis/dlls__RR__%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} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
+    COMMAND
+    set ${DLL_PATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
     DEPENDS ${xmlfile}
     ${BBTK_BBFY_DEPENDENCY} 
     )
+  ELSE(WIN32)
+    SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
+    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)
 #----------------------------------------------------------------------------
 
@@ -116,6 +128,9 @@ TARGET_LINK_LIBRARIES(bb${BBTK_PACKAGE_NAME}
   bbtk
   ${${BBTK_PACKAGE_NAME}_LIBS}
   )
+IF(UNIX)
+SET_TARGET_PROPERTIES(bb${BBTK_PACKAGE_NAME} PROPERTIES COMPILE_FLAGS -Wall)
+ENDIF(UNIX)
 #----------------------------------------------------------------------------