Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
flatbuffers
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
flatbuffers
Commits
daf0a420
Commit
daf0a420
authored
Feb 15, 2018
by
Dmitry Volosnykh
Committed by
Wouter van Oortmerssen
Feb 15, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support version compatibility checks via find_package command (#4625)
parent
474ba68b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
18 deletions
+27
-18
FlatbuffersConfigVersion.cmake.in
CMake/FlatbuffersConfigVersion.cmake.in
+11
-0
PackageDebian.cmake
CMake/PackageDebian.cmake
+1
-17
Version.cmake
CMake/Version.cmake
+11
-0
CMakeLists.txt
CMakeLists.txt
+4
-1
No files found.
CMake/FlatbuffersConfigVersion.cmake.in
0 → 100644
View file @
daf0a420
set(PACKAGE_VERSION "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@")
# Check whether the requested PACKAGE_FIND_VERSION is compatible
if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
set(PACKAGE_VERSION_COMPATIBLE FALSE)
else()
set(PACKAGE_VERSION_COMPATIBLE TRUE)
if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
set(PACKAGE_VERSION_EXACT TRUE)
endif()
endif()
CMake/PackageDebian.cmake
View file @
daf0a420
...
...
@@ -11,22 +11,6 @@ if (UNIX)
SET
(
CPACK_DEBIAN_PACKAGE_HOMEPAGE
"https://github.com/google/flatbuffers"
)
SET
(
CPACK_DEBIAN_PACKAGE_MAINTAINER
"Vitaly Isaev <vitalyisaev2@gmail.com>"
)
# Derive package version from git
EXECUTE_PROCESS
(
COMMAND date +%Y%m%d
OUTPUT_VARIABLE DATE
OUTPUT_STRIP_TRAILING_WHITESPACE
)
EXECUTE_PROCESS
(
COMMAND git describe
WORKING_DIRECTORY
${
CMAKE_SOURCE_DIR
}
OUTPUT_VARIABLE GIT_DESCRIBE_DIRTY
OUTPUT_STRIP_TRAILING_WHITESPACE
)
string
(
REGEX REPLACE
"^v([0-9]+)
\\
..*"
"
\\
1"
VERSION_MAJOR
"
${
GIT_DESCRIBE_DIRTY
}
"
)
string
(
REGEX REPLACE
"^v[0-9]+
\\
.([0-9]+).*"
"
\\
1"
VERSION_MINOR
"
${
GIT_DESCRIBE_DIRTY
}
"
)
string
(
REGEX REPLACE
"^v[0-9]+
\\
.[0-9]+
\\
.([0-9]+).*"
"
\\
1"
VERSION_PATCH
"
${
GIT_DESCRIBE_DIRTY
}
"
)
string
(
REGEX REPLACE
"^v[0-9]+
\\
.[0-9]+
\\
.[0-9]+
\\
-([0-9]+).*"
"
\\
1"
VERSION_COMMIT
"
${
GIT_DESCRIBE_DIRTY
}
"
)
SET
(
CPACK_PACKAGE_VERSION_MAJOR
${
VERSION_MAJOR
}
)
SET
(
CPACK_PACKAGE_VERSION_MINOR
${
VERSION_MINOR
}
)
SET
(
CPACK_PACKAGE_VERSION_PATCH
${
VERSION_PATCH
}
)
...
...
@@ -49,7 +33,7 @@ if (UNIX)
# Package name
SET
(
CPACK_DEBIAN_PACKAGE_NAME
"flatbuffers"
)
SET
(
CPACK_RESOURCE_FILE_LICENSE
${
CMAKE_SOURCE_DIR
}
/LICENSE.txt
)
SET
(
CPACK_PACKAGE_FILE_NAME
SET
(
CPACK_PACKAGE_FILE_NAME
"
${
CPACK_DEBIAN_PACKAGE_NAME
}
_
${
CPACK_DEBIAN_PACKAGE_VERSION
}
_
${
CPACK_DEBIAN_PACKAGE_ARCHITECTURE
}
"
)
endif
(
UNIX
)
...
...
CMake/Version.cmake
0 → 100644
View file @
daf0a420
find_program
(
GIT git
)
execute_process
(
COMMAND
${
GIT
}
describe
WORKING_DIRECTORY
${
CMAKE_SOURCE_DIR
}
OUTPUT_VARIABLE GIT_DESCRIBE_DIRTY
OUTPUT_STRIP_TRAILING_WHITESPACE
)
string
(
REGEX REPLACE
"^v([0-9]+)
\\
..*"
"
\\
1"
VERSION_MAJOR
"
${
GIT_DESCRIBE_DIRTY
}
"
)
string
(
REGEX REPLACE
"^v[0-9]+
\\
.([0-9]+).*"
"
\\
1"
VERSION_MINOR
"
${
GIT_DESCRIBE_DIRTY
}
"
)
string
(
REGEX REPLACE
"^v[0-9]+
\\
.[0-9]+
\\
.([0-9]+).*"
"
\\
1"
VERSION_PATCH
"
${
GIT_DESCRIBE_DIRTY
}
"
)
string
(
REGEX REPLACE
"^v[0-9]+
\\
.[0-9]+
\\
.[0-9]+
\\
-([0-9]+).*"
"
\\
1"
VERSION_COMMIT
"
${
GIT_DESCRIBE_DIRTY
}
"
)
CMakeLists.txt
View file @
daf0a420
...
...
@@ -253,6 +253,8 @@ if(FLATBUFFERS_BUILD_GRPCTEST)
target_link_libraries
(
grpctest grpc++_unsecure grpc_unsecure gpr pthread dl
)
endif
()
include
(
CMake/Version.cmake
)
if
(
FLATBUFFERS_INSTALL
)
include
(
GNUInstallDirs
)
...
...
@@ -260,8 +262,9 @@ if(FLATBUFFERS_INSTALL)
set
(
FB_CMAKE_DIR
"
${
CMAKE_INSTALL_LIBDIR
}
/cmake/flatbuffers"
)
configure_file
(
CMake/FlatbuffersConfigVersion.cmake.in FlatbuffersConfigVersion.cmake @ONLY
)
install
(
FILES
"CMake/FlatbuffersConfig.cmake"
FILES
"CMake/FlatbuffersConfig.cmake"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/FlatbuffersConfigVersion.cmake"
DESTINATION
${
FB_CMAKE_DIR
}
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment