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

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index ab6cfbd..c854b7b 100644
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -11,20 +11,20 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} )
 #----------------------------------------------------------------------------
 # 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 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
   )
@@ -66,9 +66,6 @@ FOREACH(xmlfile ${BBTK_PACKAGE_XML_SOURCES})
   
   GET_FILENAME_COMPONENT(filename "${xmlfile}" NAME_WE) 
   
-  #  IF(BBFY_DEPENDENCY)
-  #    SET(BBFY_DEPENDENCY_STR ${bbfy_EXECUTABLE})
-  #  ENDIF(BBFY_DEPENDENCY)
   
   SET(BBFY_CXX_OUT ${CMAKE_CURRENT_BINARY_DIR}/${filename}.cxx)
   
@@ -77,9 +74,7 @@ FOREACH(xmlfile ${BBTK_PACKAGE_XML_SOURCES})
     COMMAND 
     ${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} 
-    #${BBTK_BBFY} 
+    ${BBTK_BBFY_DEPENDENCY} 
     )
   
   SET_SOURCE_FILES_PROPERTIES(
@@ -94,7 +89,9 @@ FOREACH(xmlfile ${BBTK_PACKAGE_XML_SOURCES})
       )
   ENDIF(NOT BBTK_PACKAGE_CXX_SOURCES MATCHES "${filename}") 
   
-  INSTALL_FILES(/include/bb${BBTK_PACKAGE_NAME} FILES ${filename}.h)  
+  INSTALL(
+    FILES       ${filename}.h 
+    DESTINATION include/bb${BBTK_PACKAGE_NAME})  
 
 ENDFOREACH(xmlfile)
 #----------------------------------------------------------------------------
@@ -115,23 +112,68 @@ TARGET_LINK_LIBRARIES(bb${BBTK_PACKAGE_NAME}
 
 #----------------------------------------------------------------------------
 # 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(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)
+
+# 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)
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# Includes CMakeCreateFindPackage
+INCLUDE(${CMakeCreateFindPackage_DIR}/CMakeCreateFindPackage.cmake)
+CMAKE_CREATE_FIND_PACKAGE(${LIBRARY_NAME})
+#-----------------------------------------------------------------------------
+
 #----------------------------------------------------------------------------