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

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index 22d9338..494d9ff 100644
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -8,6 +8,10 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} )
 #----------------------------------------------------------------------------
 
+
+
+#----------------------------------------------------------------------------
+
 #----------------------------------------------------------------------------
 # CREATES bb${BBTK_PACKAGE_NAME}Package.h
 CONFIGURE_FILE(
@@ -16,7 +20,7 @@ CONFIGURE_FILE(
   @ONLY IMMEDIATE
   ) 
 INSTALL(
-  FILES bb${BBTK_PACKAGE_NAME}Package.h
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/bb${BBTK_PACKAGE_NAME}Package.h
   DESTINATION include/bb${BBTK_PACKAGE_NAME} 
   )
 #----------------------------------------------------------------------------
@@ -38,17 +42,18 @@ SET_SOURCE_FILES_PROPERTIES(
 
 
 #----------------------------------------------------------------------------
-IF(BBTK_PACKAGE_COMPILE_ALL_CXX) 
-  FILE(GLOB BBTK_PACKAGE_CXX_SOURCES "." "*.cxx")
-  FILE(GLOB BBTK_PACKAGE_H_SOURCES "." "*.h")
-ENDIF(BBTK_PACKAGE_COMPILE_ALL_CXX) 
-
-
-SET(BBTK_PACKAGE_CXX_SOURCES
-  ${BBTK_PACKAGE_CXX_SOURCES}
-  #${CMAKE_CURRENT_BINARY_DIR_NAME}/
-  bb${BBTK_PACKAGE_NAME}Package
-  )
+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) 
+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})
 #----------------------------------------------------------------------------
 
 
@@ -58,46 +63,57 @@ SET(BBTK_PACKAGE_CXX_SOURCES
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-IF(BBTK_PACKAGE_COMPILE_ALL_XML) 
-  FILE(GLOB BBTK_PACKAGE_XML_SOURCES "." "*.xml")
-ENDIF(BBTK_PACKAGE_COMPILE_ALL_XML) 
+IF(${BBTK_PACKAGE_NAME}_COMPILE_ALL_XML) 
+  FILE(GLOB ${BBTK_PACKAGE_NAME}_XML_SOURCES "." "*.xml")
+ENDIF(${BBTK_PACKAGE_NAME}_COMPILE_ALL_XML) 
 #----------------------------------------------------------------------------
-FOREACH(xmlfile ${BBTK_PACKAGE_XML_SOURCES})
+FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
   
   GET_FILENAME_COMPONENT(filename "${xmlfile}" NAME_WE) 
   
-  IF(EXISTS ${BBTK_BBFY})
-    SET(BBFY_DEPENDENCY)
-  ELSE(EXISTS ${BBTK_BBFY})
-    SET(BBFY_DEPENDENCY ${BBTK_BBFY})
-  ENDIF(EXISTS ${BBTK_BBFY})
-  
   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} ${CMAKE_CURRENT_BINARY_DIR}/ -q
+    COMMAND
+    set ${DLL_PATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
     DEPENDS ${xmlfile}
-    ${BBFY_DEPENDENCY} 
+    ${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_CXX_SOURCES MATCHES "${filename}")
-    SET(BBTK_PACKAGE_CXX_SOURCES
-      ${BBTK_PACKAGE_CXX_SOURCES}
-      ${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}.cxx
       )
-  ENDIF(NOT BBTK_PACKAGE_CXX_SOURCES MATCHES "${filename}") 
+ ENDIF(NOT ${BBTK_PACKAGE_NAME}_CXX_SOURCES MATCHES "${filename}.cxx") 
   
   INSTALL(
-    FILES       ${filename}.h 
+    FILES       ${CMAKE_CURRENT_BINARY_DIR}/${filename}.h 
     DESTINATION include/bb${BBTK_PACKAGE_NAME})  
-
 ENDFOREACH(xmlfile)
 #----------------------------------------------------------------------------
 
@@ -106,12 +122,15 @@ ENDFOREACH(xmlfile)
 #----------------------------------------------------------------------------
 # CREATES LIBRARY
 ADD_LIBRARY(bb${BBTK_PACKAGE_NAME} SHARED 
-  ${BBTK_PACKAGE_CXX_SOURCES} ${BBTK_PACKAGE_H_SOURCES}
+  ${${BBTK_PACKAGE_NAME}_CXX_SOURCES} ${${BBTK_PACKAGE_NAME}_H_SOURCES}
   )
 TARGET_LINK_LIBRARIES(bb${BBTK_PACKAGE_NAME} 
   bbtk
-  ${BBTK_PACKAGE_LIBS}
+  ${${BBTK_PACKAGE_NAME}_LIBS}
   )
+IF(UNIX)
+SET_TARGET_PROPERTIES(bb${BBTK_PACKAGE_NAME} PROPERTIES COMPILE_FLAGS -Wall)
+ENDIF(UNIX)
 #----------------------------------------------------------------------------
 
 
@@ -129,9 +148,9 @@ INSTALL(
 # CreateFindPackage
 SET( LIBRARY_NAME bb${BBTK_PACKAGE_NAME} )
 # SET THE LIB VERSION
-SET(${LIBRARY_NAME}_MAJOR_VERSION ${BBTK_PACKAGE_MAJOR_VERSION})
-SET(${LIBRARY_NAME}_MINOR_VERSION ${BBTK_PACKAGE_MINOR_VERSION})
-SET(${LIBRARY_NAME}_BUILD_VERSION ${BBTK_PACKAGE_BUILD_VERSION})
+SET(${LIBRARY_NAME}_MAJOR_VERSION ${${BBTK_PACKAGE_NAME}_MAJOR_VERSION})
+SET(${LIBRARY_NAME}_MINOR_VERSION ${${BBTK_PACKAGE_NAME}_MINOR_VERSION})
+SET(${LIBRARY_NAME}_BUILD_VERSION ${${BBTK_PACKAGE_NAME}_BUILD_VERSION})
 # 
 SET(${LIBRARY_NAME}_INSTALL_FOLDER bb${BBTK_PACKAGE_NAME})
 SET(${LIBRARY_NAME}_LIBRARIES bb${BBTK_PACKAGE_NAME})
@@ -153,24 +172,27 @@ SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS
   include/bb${BBTK_PACKAGE_NAME})
 SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
 
-# OPTIONAL 
-# - Set the version of your library
-# SET YOUR LIB VERSION
-#SET(${LIBRARY_NAME}_MAJOR_VERSION 1)
-#SET(${LIBRARY_NAME}_MINOR_VERSION 0)
-#SET(${LIBRARY_NAME}_BUILD_VERSION 0)
 # REQUIRED BUILD FLAGS
 #SET(${LIBRARY_NAME}_REQUIRED_C_FLAGS "")
 #SET(${LIBRARY_NAME}_REQUIRED_CXX_FLAGS "")
 #SET(${LIBRARY_NAME}_REQUIRED_LINK_FLAGS "")
-# ADDITIONAL CONFIG FILE
-# HERE WE USE ONE TO EXPORT testLib_EXPORTED_VALUE
-# 
-SET(${LIBRARY_NAME}_HAS_ADDITIONAL_CONFIG_FILE FALSE)
-#SET(${LIBRARY_NAME}_ADDITIONAL_CONFIG_FILE 
-#  ${PROJECT_SOURCE_DIR}/kernel/cmake/AdditionalBBTKConfig.cmake.in)
-#SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE 
-#  ${PROJECT_SOURCE_DIR}/kernel/cmake/AdditionalUseBBTK.cmake.in)
+
+# Additional config/use
+# Prepare for configure
+SET(BBTK_PACKAGE_USE_VTK ${${BBTK_PACKAGE_NAME}_USE_VTK})
+SET(BBTK_PACKAGE_USE_ITK ${${BBTK_PACKAGE_NAME}_USE_ITK})
+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_INCLUDE_DIRS  ${${BBTK_PACKAGE_NAME}_INCLUDE_DIRS})
+SET(BBTK_PACKAGE_LIBS          ${${BBTK_PACKAGE_NAME}_LIBS})
+
+SET(${LIBRARY_NAME}_HAS_ADDITIONAL_CONFIG_FILE TRUE)
+SET(${LIBRARY_NAME}_ADDITIONAL_CONFIG_FILE 
+  ${${BBTK_PACKAGE_NAME}_SOURCE_DIR}/PackageConfig.cmake.in)
+SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE 
+  ${${BBTK_PACKAGE_NAME}_SOURCE_DIR}/UsePackage.cmake.in)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------