config updates

.github/release-tag.json

@@ -1,4 +1,4 @@
 {
-  "message": "xpro version 25.2.10.4 tag",
-  "tag": "xpv25.2.10.4"
+  "message": "xpro version 25.2.10.5 tag",
+  "tag": "xpv25.2.10.5"
 }

CMake/xpflatbuffers.cmake

@@ -13,6 +13,9 @@ function(xpFlatBuffersBuild)
   if(NOT P_GENERATED_INCLUDES_DIR)
     set(P_GENERATED_INCLUDES_DIR ${CMAKE_CURRENT_BINARY_DIR}/fbs)
   endif()
+  if(NOT COMMAND build_flatbuffers)
+    include(${CMAKE_CURRENT_LIST_DIR}/BuildFlatBuffers.cmake)
+  endif()
   build_flatbuffers("${P_SCHEMAS}" "${P_SCHEMA_INCLUDE_DIRS}" ${P_CUSTOM_TARGET_NAME}
     "${P_ADDITIONAL_DEPS}" "${P_GENERATED_INCLUDES_DIR}"
     "${P_BINARY_SCHEMAS_DIR}" "${P_COPY_TEXT_SCHEMAS_DIR}"
@@ -32,11 +35,17 @@ function(xpFlatBuffersBuildTS)
   set(oneValueArgs OUTPUT_DIR TARGET)
   set(multiValueArgs SCHEMAS)
   cmake_parse_arguments(P "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-  xpGetPkgVar(flatbuffers FLATC_EXECUTABLE) # sets FLATBUFFERS_FLATC_EXECUTABLE
+  if(FLATBUFFERS_FLATC_EXECUTABLE)
+    set(FLATC ${FLATBUFFERS_FLATC_EXECUTABLE})
+  elseif(TARGET flatbuffers::flatc)
+    set(FLATC flatbuffers::flatc)
+  else()
+    set(FLATC flatc)
+  endif()
   set(cmdFile "${CMAKE_CURRENT_BINARY_DIR}/${P_TARGET}_fbs_ts_cmd")
   file(GLOB schemas ${P_SCHEMAS})
   add_custom_command(OUTPUT ${cmdFile}
-    COMMAND $<TARGET_FILE:${FLATBUFFERS_FLATC_EXECUTABLE}> --ts -o ${P_OUTPUT_DIR} ${schemas}
+    COMMAND ${FLATC} --ts -o ${P_OUTPUT_DIR} ${schemas}
     COMMAND ${CMAKE_COMMAND} -E touch ${cmdFile}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DEPENDS ${schemas}

CMakeLists.txt

@@ -618,20 +618,11 @@ if(FLATBUFFERS_INSTALL)
   if(COMMAND xpExternPackage)
     string(TOUPPER ${CMAKE_PROJECT_NAME} PRJ)
     string(JOIN "\n" EXT2
-      "# includes follow repo CMake/flatbuffers-config.cmake"
-      "include(\${CMAKE_CURRENT_LIST_DIR}/FlatcTargets.cmake OPTIONAL)"
-      "include(\${CMAKE_CURRENT_LIST_DIR}/FlatBuffersSharedTargets.cmake OPTIONAL)"
-      "include(\${CMAKE_CURRENT_LIST_DIR}/BuildFlatBuffers.cmake OPTIONAL)"
       "include(\${CMAKE_CURRENT_LIST_DIR}/xpflatbuffers.cmake OPTIONAL)"
       ""
       )
-    string(JOIN "\n" EXT3
-      "set(${PRJ}_FLATC_EXECUTABLE flatbuffers::flatc)"
-      "list(APPEND reqVars ${PRJ}_FLATC_EXECUTABLE)"
-      ""
-      )
     xpExternPackage(REPO_NAME flatbuffers TARGETS_FILE FlatBuffersTargets
-      EXE flatc LIBRARIES flatbuffers
+      EXE flatc LIBRARIES flatbuffers DEFAULT_TARGETS flatbuffers
       BASE v${CMAKE_PROJECT_VERSION} XPDIFF "patch"
       WEB "http://google.github.io/flatbuffers/" UPSTREAM "github.com/google/flatbuffers"
       DESC "efficient cross platform serialization library"
@@ -672,30 +663,30 @@ if(FLATBUFFERS_INSTALL)
 
   if(FLATBUFFERS_BUILD_FLATC)
     install(
-      TARGETS flatc EXPORT FlatcTargets
+      TARGETS flatc EXPORT FlatBuffersTargets
       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     )
 
     install(
-      EXPORT FlatcTargets
-      FILE FlatcTargets.cmake
+      EXPORT FlatBuffersTargets
+      FILE FlatBuffersTargets.cmake
       NAMESPACE flatbuffers::
       DESTINATION ${FB_CMAKE_DIR}
     )
   endif()
 
   if(FLATBUFFERS_BUILD_SHAREDLIB)
     install(
-      TARGETS flatbuffers_shared EXPORT FlatBuffersSharedTargets
+      TARGETS flatbuffers_shared EXPORT FlatBuffersTargets
       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
       RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
       INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     )
 
     install(
-      EXPORT FlatBuffersSharedTargets
-      FILE FlatBuffersSharedTargets.cmake
+      EXPORT FlatBuffersTargets
+      FILE FlatBuffersTargets.cmake
       NAMESPACE flatbuffers::
       DESTINATION ${FB_CMAKE_DIR}
     )