X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage_src.cmake;h=967fbde369c8fb42e6377287c64b274c030938b1;hb=acec0f7b93efd8318c826ff6b006fde051993c5a;hp=43179eaa08845d6cbb681b10549613234706e98d;hpb=a26195c366a89795288009cf7e20f11afa494970;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index 43179ea..967fbde 100644
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -8,20 +8,42 @@ 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})
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+# VARS CONFIGURED IN bbPackage.h 
+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_VERSION 
+  "\"${${BBTK_PACKAGE_NAME}_MAJOR_VERSION}.${${BBTK_PACKAGE_NAME}_MINOR_VERSION}.${${BBTK_PACKAGE_NAME}_BUILD_VERSION}\"")
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+
 #----------------------------------------------------------------------------
 # CREATES bb${BBTK_PACKAGE_NAME}Package.h
 CONFIGURE_FILE(
-  ${BBTK_DIR}/bbPackage.h.in
+  ${BBTK_CMAKE_DIR}/bbPackage.h.in
   ${CMAKE_CURRENT_BINARY_DIR}/bb${BBTK_PACKAGE_NAME}Package.h
   @ONLY IMMEDIATE
   ) 
-INSTALL_FILES(/include/bb${BBTK_PACKAGE_NAME} FILES bb${BBTK_PACKAGE_NAME}Package.h)  
+INSTALL(
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/bb${BBTK_PACKAGE_NAME}Package.h
+  DESTINATION include/bb${BBTK_PACKAGE_NAME} 
+  )
 #----------------------------------------------------------------------------
   
 #----------------------------------------------------------------------------
 # CREATES bb${BBTK_PACKAGE_NAME}Package.cxx
 CONFIGURE_FILE(
-  ${BBTK_DIR}/bbPackage.cxx.in
+  ${BBTK_CMAKE_DIR}/bbPackage.cxx.in
   ${CMAKE_CURRENT_BINARY_DIR}/bb${BBTK_PACKAGE_NAME}Package.cxx
   @ONLY IMMEDIATE
   )
@@ -35,14 +57,14 @@ 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) 
+IF(${BBTK_PACKAGE_NAME}_COMPILE_ALL_CXX) 
+  FILE(GLOB ${BBTK_PACKAGE_NAME}_CXX_SOURCES "." "*.cxx")
+  FILE(GLOB ${BBTK_PACKAGE_NAME}_H_SOURCES "." "*.h")
+ENDIF(${BBTK_PACKAGE_NAME}_COMPILE_ALL_CXX) 
 
 
-SET(BBTK_PACKAGE_CXX_SOURCES
-  ${BBTK_PACKAGE_CXX_SOURCES}
+SET(${BBTK_PACKAGE_NAME}_CXX_SOURCES
+  ${${BBTK_PACKAGE_NAME}_CXX_SOURCES}
   #${CMAKE_CURRENT_BINARY_DIR_NAME}/
   bb${BBTK_PACKAGE_NAME}Package
   )
@@ -55,34 +77,23 @@ 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(WIN32)
-    SET(bbfy_EXECUTABLE $(TargetDir)/bbfy.exe)
-  ELSE(WIN32)
-    SET(bbfy_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/bbfy)
-  ENDIF(WIN32)      
-  
-  IF(BBFY_DEPENDENCY)
-    SET(BBFY_DEPENDENCY_STR ${bbfy_EXECUTABLE})
-  ENDIF(BBFY_DEPENDENCY)
   
   SET(BBFY_CXX_OUT ${CMAKE_CURRENT_BINARY_DIR}/${filename}.cxx)
   
   ADD_CUSTOM_COMMAND(
     OUTPUT ${BBFY_CXX_OUT}
     COMMAND 
-    ${bbfy_EXECUTABLE} ${xmlfile} ${CMAKE_CURRENT_BINARY_DIR}/ -q
+    ${BBTK_BBFY} ${xmlfile} ${CMAKE_CURRENT_BINARY_DIR}/ -q
     DEPENDS ${xmlfile}
-    # LG : REMOVE AUTOMATIC DEPEDENCY ON bbfy BECAUSE CAUSED ALWAYS REBUILD xml BOXES WHEN bbtk CHANGED HENCE bbfy CHANGED
-    ${BBFY_DEPENDENCY_STR} 
-    #${bbfy_EXECUTABLE} 
+    ${BBTK_BBFY_DEPENDENCY} 
     )
   
   SET_SOURCE_FILES_PROPERTIES(
@@ -90,14 +101,17 @@ FOREACH(xmlfile ${BBTK_PACKAGE_XML_SOURCES})
     PROPERTIES GENERATED ON)
   
   
-  IF(NOT BBTK_PACKAGE_CXX_SOURCES MATCHES "${filename}")
-    SET(BBTK_PACKAGE_CXX_SOURCES
-      ${BBTK_PACKAGE_CXX_SOURCES}
+  IF(NOT ${BBTK_PACKAGE_NAME}_CXX_SOURCES MATCHES "${filename}")
+    SET(${BBTK_PACKAGE_NAME}_CXX_SOURCES
+      ${${BBTK_PACKAGE_NAME}_CXX_SOURCES}
       ${filename}
       )
-  ENDIF(NOT BBTK_PACKAGE_CXX_SOURCES MATCHES "${filename}") 
+  ENDIF(NOT ${BBTK_PACKAGE_NAME}_CXX_SOURCES MATCHES "${filename}") 
   
-  INSTALL_FILES(/include/bb${BBTK_PACKAGE_NAME} FILES ${filename}.h)  
+  INSTALL(
+    FILES       ${CMAKE_CURRENT_BINARY_DIR}/${filename}.h 
+    DESTINATION include/bb${BBTK_PACKAGE_NAME})  
+
 ENDFOREACH(xmlfile)
 #----------------------------------------------------------------------------
 
@@ -106,35 +120,82 @@ 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
-  #  ${BBP_LINK_LIBRARIES} 
-  ${BBTK_PACKAGE_LIBS}
+  ${${BBTK_PACKAGE_NAME}_LIBS}
   )
 #----------------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------------
 # INSTALLS LIBRARY
-# NOW USES THE InstallLibrary.cmake 
+FILE(GLOB ${BBTK_PACKAGE_NAME}_HEADERS "*.h")
+INSTALL(
+  FILES ${${BBTK_PACKAGE_NAME}_HEADERS}
+  DESTINATION include/bb${BBTK_PACKAGE_NAME}
+  )  
+INSTALL(
+  TARGETS bb${BBTK_PACKAGE_NAME} 
+  DESTINATION lib)
+
+# 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(INSTALL_LIBRARY_PATH ../cmake)
-# Include the file 'InstallLibrary.cmake' which does the clean install job
-#INCLUDE(${INSTALL_LIBRARY_PATH}/InstallLibrary.cmake)
-
-# OLD VERSION :
-# DEPRECATED SYNTAX BUT WHICH WORKS !!
-INSTALL_FILES(/include/bb${BBTK_PACKAGE_NAME} "\\.h$")  
-#INSTALL(FILES "$.h" DESTINATION include/${BBTK_PACKAGE_NAME})  
-INSTALL(TARGETS bb${BBTK_PACKAGE_NAME} DESTINATION lib)
-#  INSTALL_TARGETS(/lib bb${BBTK_PACKAGE_NAME})
+SET(${LIBRARY_NAME}_INSTALL_FOLDER bb${BBTK_PACKAGE_NAME})
+SET(${LIBRARY_NAME}_LIBRARIES bb${BBTK_PACKAGE_NAME})
+
+FILE(RELATIVE_PATH 
+  ${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS 
+  ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
+  )
+
+IF(UNIX)
+  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
+    ${EXECUTABLE_OUTPUT_REL_PATH})
+ELSE(UNIX)
+  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
+    ${EXECUTABLE_OUTPUT_REL_PATH}/Debug
+    ${EXECUTABLE_OUTPUT_REL_PATH}/Release)
+ENDIF(UNIX)
+SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS 
+  include/bb${BBTK_PACKAGE_NAME})
+SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
+
+# REQUIRED BUILD FLAGS
+#SET(${LIBRARY_NAME}_REQUIRED_C_FLAGS "")
+#SET(${LIBRARY_NAME}_REQUIRED_CXX_FLAGS "")
+#SET(${LIBRARY_NAME}_REQUIRED_LINK_FLAGS "")
+
+# 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)
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# Includes CMakeCreateFindPackage
+INCLUDE(${CMakeCreateFindPackage_DIR}/CMakeCreateFindPackage.cmake)
+CMAKE_CREATE_FIND_PACKAGE(${LIBRARY_NAME})
+#-----------------------------------------------------------------------------
+
 #----------------------------------------------------------------------------