From ac0ae75566f9c605582f9f94ae03abe268026c4e Mon Sep 17 00:00:00 2001 From: chausner Date: Fri, 30 Sep 2022 23:46:10 +0200 Subject: [PATCH 1/4] Update flatbuffers to 2.0.8 --- recipes/flatbuffers/all/conandata.yml | 3 +++ recipes/flatbuffers/all/conanfile.py | 10 ++++++++-- recipes/flatbuffers/all/test_package/CMakeLists.txt | 2 +- recipes/flatbuffers/all/test_v1_package/CMakeLists.txt | 2 +- recipes/flatbuffers/config.yml | 2 ++ 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/recipes/flatbuffers/all/conandata.yml b/recipes/flatbuffers/all/conandata.yml index 1208a783b9e4f..e9889e6085f44 100644 --- a/recipes/flatbuffers/all/conandata.yml +++ b/recipes/flatbuffers/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "2.0.8": + url: "https://github.com/google/flatbuffers/archive/refs/tags/v2.0.8.tar.gz" + sha256: "f97965a727d26386afaefff950badef2db3ab6af9afe23ed6d94bfb65f95f37e" "2.0.6": url: "https://github.com/google/flatbuffers/archive/refs/tags/v2.0.6.tar.gz" sha256: "e2dc24985a85b278dd06313481a9ca051d048f9474e0f199e372fea3ea4248c9" diff --git a/recipes/flatbuffers/all/conanfile.py b/recipes/flatbuffers/all/conanfile.py index ad32669a4f07f..eb870b93c40bc 100644 --- a/recipes/flatbuffers/all/conanfile.py +++ b/recipes/flatbuffers/all/conanfile.py @@ -132,7 +132,10 @@ def _module_path(self): def package_info(self): self.cpp_info.set_property("cmake_find_mode", "both") self.cpp_info.set_property("cmake_module_file_name", "FlatBuffers") - self.cpp_info.set_property("cmake_file_name", "Flatbuffers") + if Version(self.version) < "2.0.7": + self.cpp_info.set_property("cmake_file_name", "Flatbuffers") + else: + self.cpp_info.set_property("cmake_file_name", "FlatBuffers") cmake_target = "flatbuffers" if not self.options.header_only and self.options.shared: cmake_target += "_shared" @@ -158,7 +161,10 @@ def package_info(self): # TODO: to remove in conan v2 once cmake_find_package* generators removed self.cpp_info.filenames["cmake_find_package"] = "FlatBuffers" - self.cpp_info.filenames["cmake_find_package_multi"] = "Flatbuffers" + if Version(self.version) < "2.0.7": + self.cpp_info.filenames["cmake_find_package_multi"] = "Flatbuffers" + else: + self.cpp_info.filenames["cmake_find_package_multi"] = "FlatBuffers" self.cpp_info.names["cmake_find_package"] = "flatbuffers" self.cpp_info.names["cmake_find_package_multi"] = "flatbuffers" self.cpp_info.components["libflatbuffers"].names["cmake_find_package"] = cmake_target diff --git a/recipes/flatbuffers/all/test_package/CMakeLists.txt b/recipes/flatbuffers/all/test_package/CMakeLists.txt index e6501abcaf1ef..9821f2e7869ea 100644 --- a/recipes/flatbuffers/all/test_package/CMakeLists.txt +++ b/recipes/flatbuffers/all/test_package/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.8) project(test_package LANGUAGES CXX) -find_package(Flatbuffers REQUIRED CONFIG) +find_package(FlatBuffers NAMES Flatbuffers FlatBuffers REQUIRED CONFIG) if(TARGET flatbuffers::flatbuffers_shared) set(FLATBUFFERS_TARGET flatbuffers::flatbuffers_shared) else() diff --git a/recipes/flatbuffers/all/test_v1_package/CMakeLists.txt b/recipes/flatbuffers/all/test_v1_package/CMakeLists.txt index 82b6707821d58..2398c7892287a 100644 --- a/recipes/flatbuffers/all/test_v1_package/CMakeLists.txt +++ b/recipes/flatbuffers/all/test_v1_package/CMakeLists.txt @@ -4,7 +4,7 @@ project(test_package LANGUAGES CXX) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup(TARGETS) -find_package(Flatbuffers REQUIRED CONFIG) +find_package(FlatBuffers NAMES Flatbuffers FlatBuffers REQUIRED CONFIG) if(TARGET flatbuffers::flatbuffers_shared) set(FLATBUFFERS_TARGET flatbuffers::flatbuffers_shared) else() diff --git a/recipes/flatbuffers/config.yml b/recipes/flatbuffers/config.yml index d58a0e5127c56..35c8973207d4c 100644 --- a/recipes/flatbuffers/config.yml +++ b/recipes/flatbuffers/config.yml @@ -1,4 +1,6 @@ versions: + "2.0.8": + folder: all "2.0.6": folder: all "2.0.5": From 7f7a5c57027924bbb06b104efcc0b9ba4290cac1 Mon Sep 17 00:00:00 2001 From: chausner Date: Sat, 1 Oct 2022 14:05:47 +0200 Subject: [PATCH 2/4] Fix version variables --- recipes/flatbuffers/all/conanfile.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes/flatbuffers/all/conanfile.py b/recipes/flatbuffers/all/conanfile.py index eb870b93c40bc..cc4532f0d3557 100644 --- a/recipes/flatbuffers/all/conanfile.py +++ b/recipes/flatbuffers/all/conanfile.py @@ -77,9 +77,10 @@ def generate(self): tc.variables["FLATBUFFERS_LIBCXX_WITH_CLANG"] = False # Mimic upstream CMake/Version.cmake removed in _patch_sources() version = Version(self.version) - tc.variables["VERSION_MAJOR"] = version.major - tc.variables["VERSION_MINOR"] = version.minor - tc.variables["VERSION_PATCH"] = version.patch + tc.cache_variables["VERSION_MAJOR"] = str(version.major) + tc.cache_variables["VERSION_MINOR"] = str(version.minor or "0") + tc.cache_variables["VERSION_PATCH"] = str(version.patch or "0") + tc.cache_variables["VERSION_COMMIT"] = str(version.pre or "0") # For msvc shared tc.variables["CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS"] = True # Relocatable shared libs on Macos From d4c03f3a3267b27df147488e0878fab136f76c06 Mon Sep 17 00:00:00 2001 From: chausner Date: Sat, 1 Oct 2022 21:10:16 +0200 Subject: [PATCH 3/4] Change CMake file names to lowercase --- recipes/flatbuffers/all/conanfile.py | 14 ++++---------- .../flatbuffers/all/test_package/CMakeLists.txt | 2 +- .../flatbuffers/all/test_v1_package/CMakeLists.txt | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/recipes/flatbuffers/all/conanfile.py b/recipes/flatbuffers/all/conanfile.py index cc4532f0d3557..5ad2a8ea74e82 100644 --- a/recipes/flatbuffers/all/conanfile.py +++ b/recipes/flatbuffers/all/conanfile.py @@ -132,11 +132,8 @@ def _module_path(self): def package_info(self): self.cpp_info.set_property("cmake_find_mode", "both") - self.cpp_info.set_property("cmake_module_file_name", "FlatBuffers") - if Version(self.version) < "2.0.7": - self.cpp_info.set_property("cmake_file_name", "Flatbuffers") - else: - self.cpp_info.set_property("cmake_file_name", "FlatBuffers") + self.cpp_info.set_property("cmake_module_file_name", "flatbuffers") + self.cpp_info.set_property("cmake_file_name", "flatbuffers") cmake_target = "flatbuffers" if not self.options.header_only and self.options.shared: cmake_target += "_shared" @@ -161,11 +158,8 @@ def package_info(self): self.env_info.PATH.append(bindir) # TODO: to remove in conan v2 once cmake_find_package* generators removed - self.cpp_info.filenames["cmake_find_package"] = "FlatBuffers" - if Version(self.version) < "2.0.7": - self.cpp_info.filenames["cmake_find_package_multi"] = "Flatbuffers" - else: - self.cpp_info.filenames["cmake_find_package_multi"] = "FlatBuffers" + self.cpp_info.filenames["cmake_find_package"] = "flatbuffers" + self.cpp_info.filenames["cmake_find_package_multi"] = "flatbuffers" self.cpp_info.names["cmake_find_package"] = "flatbuffers" self.cpp_info.names["cmake_find_package_multi"] = "flatbuffers" self.cpp_info.components["libflatbuffers"].names["cmake_find_package"] = cmake_target diff --git a/recipes/flatbuffers/all/test_package/CMakeLists.txt b/recipes/flatbuffers/all/test_package/CMakeLists.txt index 9821f2e7869ea..e4d22dcbf68fe 100644 --- a/recipes/flatbuffers/all/test_package/CMakeLists.txt +++ b/recipes/flatbuffers/all/test_package/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.8) project(test_package LANGUAGES CXX) -find_package(FlatBuffers NAMES Flatbuffers FlatBuffers REQUIRED CONFIG) +find_package(FlatBuffers REQUIRED CONFIG) if(TARGET flatbuffers::flatbuffers_shared) set(FLATBUFFERS_TARGET flatbuffers::flatbuffers_shared) else() diff --git a/recipes/flatbuffers/all/test_v1_package/CMakeLists.txt b/recipes/flatbuffers/all/test_v1_package/CMakeLists.txt index 2398c7892287a..2afd0f99c22b5 100644 --- a/recipes/flatbuffers/all/test_v1_package/CMakeLists.txt +++ b/recipes/flatbuffers/all/test_v1_package/CMakeLists.txt @@ -4,7 +4,7 @@ project(test_package LANGUAGES CXX) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup(TARGETS) -find_package(FlatBuffers NAMES Flatbuffers FlatBuffers REQUIRED CONFIG) +find_package(FlatBuffers REQUIRED CONFIG) if(TARGET flatbuffers::flatbuffers_shared) set(FLATBUFFERS_TARGET flatbuffers::flatbuffers_shared) else() From ae4bff521c9c359274029f8b4fabf5d1451ef7cc Mon Sep 17 00:00:00 2001 From: chausner Date: Sat, 1 Oct 2022 21:12:51 +0200 Subject: [PATCH 4/4] Add CMake build requirement --- recipes/flatbuffers/all/conanfile.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes/flatbuffers/all/conanfile.py b/recipes/flatbuffers/all/conanfile.py index 5ad2a8ea74e82..7a56fe8b533bc 100644 --- a/recipes/flatbuffers/all/conanfile.py +++ b/recipes/flatbuffers/all/conanfile.py @@ -43,6 +43,10 @@ def config_options(self): if self.settings.os == "Windows": del self.options.fPIC + def build_requirements(self): + if Version(self.version) >= "2.0.7": + self.tool_requires("cmake/3.24.0") + def configure(self): if self.options.shared or self.options.header_only: del self.options.fPIC