X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage_src.cmake;h=d4fac9cb3e820695936505cb266d0199ae3d3a62;hb=fc6d759c87715cabfc3d266463f0c89fa3040921;hp=c2f17095c91413327aeb01fff0c5644adce5e8f5;hpb=a09174b82cb36ffd30bdbaed12c6ebd936a0e8f7;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index c2f1709..d4fac9c 100644
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -44,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})
 #----------------------------------------------------------------------------
 
 
@@ -84,17 +85,18 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
     ${BBTK_BBFY_DEPENDENCY} 
     )
   ELSE(WIN32)
- ADD_CUSTOM_COMMAND(
-    OUTPUT ${BBFY_CXX_OUT}
-    COMMAND
-    ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
-    DEPENDS ${xmlfile}
-    ${BBTK_BBFY_DEPENDENCY} 
-    )
-
-	ENDIF(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)
@@ -125,7 +127,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)
 #----------------------------------------------------------------------------