BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-29 08:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

(#7323) Rename CMake files according to project name (#7378)

Browse Source 
* CMake find_package fixes (#7323)

Rename FlatbuffersConfigVersion.cmake to match CMake project name

* CMake find_package fixes (#7323)

Rename FlatBuffersTargets to match CMake project name
This commit is contained in:
Chris Langhans
2022-08-06 07:19:17 +02:00
committed by GitHub
parent 32328075d8
commit aa395e5a59
5 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CMake/CMakeLists_legacy.cmake.in
View File

@@ -654,28 +654,28 @@ if(FLATBUFFERS_INSTALL)
set(FB_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/flatbuffers") set(FB_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/flatbuffers")
configure_file(CMake/FlatbuffersConfigVersion.cmake.in FlatbuffersConfigVersion.cmake @ONLY) configure_file(CMake/FlatBuffersConfigVersion.cmake.in FlatBuffersConfigVersion.cmake @ONLY)
install( install(
FILES "CMake/FlatbuffersConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/FlatbuffersConfigVersion.cmake" FILES "CMake/FlatBuffersConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/FlatBuffersConfigVersion.cmake"
DESTINATION ${FB_CMAKE_DIR} DESTINATION ${FB_CMAKE_DIR}
) )
if(FLATBUFFERS_BUILD_FLATLIB) if(FLATBUFFERS_BUILD_FLATLIB)
if(CMAKE_VERSION VERSION_LESS 3.0) if(CMAKE_VERSION VERSION_LESS 3.0)
install( install(
TARGETS flatbuffers EXPORT FlatbuffersTargets TARGETS flatbuffers EXPORT FlatBuffersTargets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
else() else()
install( install(
TARGETS flatbuffers EXPORT FlatbuffersTargets TARGETS flatbuffers EXPORT FlatBuffersTargets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
) )
endif() endif()
install(EXPORT FlatbuffersTargets install(EXPORT FlatBuffersTargets
FILE FlatbuffersTargets.cmake FILE FlatBuffersTargets.cmake
NAMESPACE flatbuffers:: NAMESPACE flatbuffers::
DESTINATION ${FB_CMAKE_DIR} DESTINATION ${FB_CMAKE_DIR}
) )
@@ -698,14 +698,14 @@ if(FLATBUFFERS_INSTALL)
if(FLATBUFFERS_BUILD_SHAREDLIB) if(FLATBUFFERS_BUILD_SHAREDLIB)
if(CMAKE_VERSION VERSION_LESS 3.0) if(CMAKE_VERSION VERSION_LESS 3.0)
install( install(
TARGETS flatbuffers_shared EXPORT FlatbuffersSharedTargets TARGETS flatbuffers_shared EXPORT FlatBuffersSharedTargets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
else() else()
install( install(
TARGETS flatbuffers_shared EXPORT FlatbuffersSharedTargets TARGETS flatbuffers_shared EXPORT FlatBuffersSharedTargets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -714,8 +714,8 @@ if(FLATBUFFERS_INSTALL)
endif() endif()
install( install(
EXPORT FlatbuffersSharedTargets EXPORT FlatBuffersSharedTargets
FILE FlatbuffersSharedTargets.cmake FILE FlatBuffersSharedTargets.cmake
NAMESPACE flatbuffers:: NAMESPACE flatbuffers::
DESTINATION ${FB_CMAKE_DIR} DESTINATION ${FB_CMAKE_DIR}
) )

3
CMake/FlatBuffersConfig.cmake Normal file
View File

@@ -0,0 +1,3 @@
include("${CMAKE_CURRENT_LIST_DIR}/FlatBuffersTargets.cmake" OPTIONAL)
include("${CMAKE_CURRENT_LIST_DIR}/FlatcTargets.cmake" OPTIONAL)
include("${CMAKE_CURRENT_LIST_DIR}/FlatBuffersSharedTargets.cmake" OPTIONAL)

0
CMake/FlatbuffersConfigVersion.cmake.in → CMake/FlatBuffersConfigVersion.cmake.in
View File

4
CMake/FlatbuffersConfig.cmake
View File

@@ -1,4 +0,0 @@
include("${CMAKE_CURRENT_LIST_DIR}/FlatbuffersTargets.cmake" OPTIONAL)
include("${CMAKE_CURRENT_LIST_DIR}/FlatcTargets.cmake" OPTIONAL)
include("${CMAKE_CURRENT_LIST_DIR}/FlatbuffersSharedTargets.cmake" OPTIONAL)

18
CMakeLists.txt
View File

@@ -645,21 +645,21 @@ if(FLATBUFFERS_INSTALL)
set(FB_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/flatbuffers") set(FB_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/flatbuffers")
configure_file(CMake/FlatbuffersConfigVersion.cmake.in FlatbuffersConfigVersion.cmake @ONLY) configure_file(CMake/FlatBuffersConfigVersion.cmake.in FlatBuffersConfigVersion.cmake @ONLY)
install( install(
FILES "CMake/FlatbuffersConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/FlatbuffersConfigVersion.cmake" FILES "CMake/FlatBuffersConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/FlatBuffersConfigVersion.cmake"
DESTINATION ${FB_CMAKE_DIR} DESTINATION ${FB_CMAKE_DIR}
) )
if(FLATBUFFERS_BUILD_FLATLIB) if(FLATBUFFERS_BUILD_FLATLIB)
install( install(
TARGETS flatbuffers EXPORT FlatbuffersTargets TARGETS flatbuffers EXPORT FlatBuffersTargets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
) )
install(EXPORT FlatbuffersTargets install(EXPORT FlatBuffersTargets
FILE FlatbuffersTargets.cmake FILE FlatBuffersTargets.cmake
NAMESPACE flatbuffers:: NAMESPACE flatbuffers::
DESTINATION ${FB_CMAKE_DIR} DESTINATION ${FB_CMAKE_DIR}
) )
@@ -681,7 +681,7 @@ if(FLATBUFFERS_INSTALL)
if(FLATBUFFERS_BUILD_SHAREDLIB) if(FLATBUFFERS_BUILD_SHAREDLIB)
install( install(
TARGETS flatbuffers_shared EXPORT FlatbuffersSharedTargets TARGETS flatbuffers_shared EXPORT FlatBuffersSharedTargets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -689,8 +689,8 @@ if(FLATBUFFERS_INSTALL)
) )
install( install(
EXPORT FlatbuffersSharedTargets EXPORT FlatBuffersSharedTargets
FILE FlatbuffersSharedTargets.cmake FILE FlatBuffersSharedTargets.cmake
NAMESPACE flatbuffers:: NAMESPACE flatbuffers::
DESTINATION ${FB_CMAKE_DIR} DESTINATION ${FB_CMAKE_DIR}
) )
@@ -752,4 +752,4 @@ add_library(FlatBuffers::FlatBuffers ALIAS FlatBuffers)
target_include_directories( target_include_directories(
FlatBuffers FlatBuffers
INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/include>) $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/include>)