From aa395e5a59524892cf514e89ad91bfe9e02a0462 Mon Sep 17 00:00:00 2001 From: Chris Langhans Date: Sat, 6 Aug 2022 07:19:17 +0200 Subject: [PATCH] (#7323) Rename CMake files according to project name (#7378) * 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 --- CMake/CMakeLists_legacy.cmake.in | 20 +++++++++---------- CMake/FlatBuffersConfig.cmake | 3 +++ ...e.in => FlatBuffersConfigVersion.cmake.in} | 0 CMake/FlatbuffersConfig.cmake | 4 ---- CMakeLists.txt | 18 ++++++++--------- 5 files changed, 22 insertions(+), 23 deletions(-) create mode 100644 CMake/FlatBuffersConfig.cmake rename CMake/{FlatbuffersConfigVersion.cmake.in => FlatBuffersConfigVersion.cmake.in} (100%) delete mode 100644 CMake/FlatbuffersConfig.cmake diff --git a/CMake/CMakeLists_legacy.cmake.in b/CMake/CMakeLists_legacy.cmake.in index e92de42d9..8ca0f8790 100644 --- a/CMake/CMakeLists_legacy.cmake.in +++ b/CMake/CMakeLists_legacy.cmake.in @@ -654,28 +654,28 @@ if(FLATBUFFERS_INSTALL) 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( - FILES "CMake/FlatbuffersConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/FlatbuffersConfigVersion.cmake" + FILES "CMake/FlatBuffersConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/FlatBuffersConfigVersion.cmake" DESTINATION ${FB_CMAKE_DIR} ) if(FLATBUFFERS_BUILD_FLATLIB) if(CMAKE_VERSION VERSION_LESS 3.0) install( - TARGETS flatbuffers EXPORT FlatbuffersTargets + TARGETS flatbuffers EXPORT FlatBuffersTargets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) else() install( - TARGETS flatbuffers EXPORT FlatbuffersTargets + TARGETS flatbuffers EXPORT FlatBuffersTargets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) endif() - install(EXPORT FlatbuffersTargets - FILE FlatbuffersTargets.cmake + install(EXPORT FlatBuffersTargets + FILE FlatBuffersTargets.cmake NAMESPACE flatbuffers:: DESTINATION ${FB_CMAKE_DIR} ) @@ -698,14 +698,14 @@ if(FLATBUFFERS_INSTALL) if(FLATBUFFERS_BUILD_SHAREDLIB) if(CMAKE_VERSION VERSION_LESS 3.0) install( - TARGETS flatbuffers_shared EXPORT FlatbuffersSharedTargets + TARGETS flatbuffers_shared EXPORT FlatBuffersSharedTargets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) else() install( - TARGETS flatbuffers_shared EXPORT FlatbuffersSharedTargets + TARGETS flatbuffers_shared EXPORT FlatBuffersSharedTargets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -714,8 +714,8 @@ if(FLATBUFFERS_INSTALL) endif() install( - EXPORT FlatbuffersSharedTargets - FILE FlatbuffersSharedTargets.cmake + EXPORT FlatBuffersSharedTargets + FILE FlatBuffersSharedTargets.cmake NAMESPACE flatbuffers:: DESTINATION ${FB_CMAKE_DIR} ) diff --git a/CMake/FlatBuffersConfig.cmake b/CMake/FlatBuffersConfig.cmake new file mode 100644 index 000000000..592fc79b6 --- /dev/null +++ b/CMake/FlatBuffersConfig.cmake @@ -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) diff --git a/CMake/FlatbuffersConfigVersion.cmake.in b/CMake/FlatBuffersConfigVersion.cmake.in similarity index 100% rename from CMake/FlatbuffersConfigVersion.cmake.in rename to CMake/FlatBuffersConfigVersion.cmake.in diff --git a/CMake/FlatbuffersConfig.cmake b/CMake/FlatbuffersConfig.cmake deleted file mode 100644 index 107d78e98..000000000 --- a/CMake/FlatbuffersConfig.cmake +++ /dev/null @@ -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) - diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cff05159..ff881c05e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -645,21 +645,21 @@ if(FLATBUFFERS_INSTALL) 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( - FILES "CMake/FlatbuffersConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/FlatbuffersConfigVersion.cmake" + FILES "CMake/FlatBuffersConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/FlatBuffersConfigVersion.cmake" DESTINATION ${FB_CMAKE_DIR} ) if(FLATBUFFERS_BUILD_FLATLIB) install( - TARGETS flatbuffers EXPORT FlatbuffersTargets + TARGETS flatbuffers EXPORT FlatBuffersTargets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) - install(EXPORT FlatbuffersTargets - FILE FlatbuffersTargets.cmake + install(EXPORT FlatBuffersTargets + FILE FlatBuffersTargets.cmake NAMESPACE flatbuffers:: DESTINATION ${FB_CMAKE_DIR} ) @@ -681,7 +681,7 @@ if(FLATBUFFERS_INSTALL) if(FLATBUFFERS_BUILD_SHAREDLIB) install( - TARGETS flatbuffers_shared EXPORT FlatbuffersSharedTargets + TARGETS flatbuffers_shared EXPORT FlatBuffersSharedTargets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -689,8 +689,8 @@ if(FLATBUFFERS_INSTALL) ) install( - EXPORT FlatbuffersSharedTargets - FILE FlatbuffersSharedTargets.cmake + EXPORT FlatBuffersSharedTargets + FILE FlatBuffersSharedTargets.cmake NAMESPACE flatbuffers:: DESTINATION ${FB_CMAKE_DIR} ) @@ -752,4 +752,4 @@ add_library(FlatBuffers::FlatBuffers ALIAS FlatBuffers) target_include_directories( FlatBuffers INTERFACE $ - $) \ No newline at end of file + $)