Skip to content

Commit 2e3a117

Browse files
authored
Merge pull request #7 from externpro/fixes
fixes
2 parents 8d563ad + 2505622 commit 2e3a117

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/release-tag.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"message": "xpro version 25.2.10.5 tag",
3-
"tag": "xpv25.2.10.5"
2+
"message": "xpro version 25.2.10.6 tag",
3+
"tag": "xpv25.2.10.6"
44
}

CMake/xpflatbuffers.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function(xpFlatBuffersBuild)
1414
set(P_GENERATED_INCLUDES_DIR ${CMAKE_CURRENT_BINARY_DIR}/fbs)
1515
endif()
1616
if(NOT COMMAND build_flatbuffers)
17-
include(${CMAKE_CURRENT_LIST_DIR}/BuildFlatBuffers.cmake)
17+
include(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/BuildFlatBuffers.cmake)
1818
endif()
1919
build_flatbuffers("${P_SCHEMAS}" "${P_SCHEMA_INCLUDE_DIRS}" ${P_CUSTOM_TARGET_NAME}
2020
"${P_ADDITIONAL_DEPS}" "${P_GENERATED_INCLUDES_DIR}"

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ if(FLATBUFFERS_INSTALL)
623623
)
624624
xpExternPackage(REPO_NAME flatbuffers TARGETS_FILE FlatBuffersTargets
625625
EXE flatc LIBRARIES flatbuffers DEFAULT_TARGETS flatbuffers
626-
BASE v${CMAKE_PROJECT_VERSION} XPDIFF "patch"
626+
BASE v${CMAKE_PROJECT_VERSION} XPDIFF "patch" FIND_XPRO_CMAKE
627627
WEB "http://google.github.io/flatbuffers/" UPSTREAM "github.com/google/flatbuffers"
628628
DESC "efficient cross platform serialization library"
629629
LICENSE "[Apache-2.0](https://github.com/google/flatbuffers/blob/v25.2.10/LICENSE 'Apache License, Version 2.0')"

0 commit comments

Comments
 (0)