X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage_src.cmake;h=58583e323d2384b2c251336b0eb4e619d2fd0c90;hb=1ae35ab233d889137ae2e0a347f55b960ab4b855;hp=c7ba3dc6b399906d0d916051d3284fdb73a5caef;hpb=ba235cfa6ce74178ab468c01af002af0ab3a7d82;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index c7ba3dc..58583e3 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})
 #----------------------------------------------------------------------------
 
 
@@ -78,28 +74,30 @@ 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__" "\;" SETPATH ${command00} )
-	#    SET(SETPATH set ${command0} &&)
+    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
-    set ${SETPATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
+    set Path=${DLL_PATH} && ${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
-    ${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)
@@ -130,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)
 #----------------------------------------------------------------------------
 
 
@@ -142,7 +143,7 @@ INSTALL(
   )  
 INSTALL(
   TARGETS bb${BBTK_PACKAGE_NAME} 
-  DESTINATION lib)
+  DESTINATION ${BBTK_PACKAGE_LIB_PATH})
 
 # CreateFindPackage
 SET( LIBRARY_NAME bb${BBTK_PACKAGE_NAME} )
@@ -169,7 +170,7 @@ ELSE(UNIX)
 ENDIF(UNIX)
 SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS 
   include/bb${BBTK_PACKAGE_NAME})
-SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
+SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${BBTK_PACKAGE_LIB_PATH})
 
 # REQUIRED BUILD FLAGS
 #SET(${LIBRARY_NAME}_REQUIRED_C_FLAGS "")