Merge pull request #2592 from jgsogo/fix/arrow

[arrow] Fix typos + test using cmake_find_package
conan-io · Aug 24, 2020 · 9048415 · 9048415
2 parents c9cadec + 88011c2
commit 9048415
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/recipes/arrow/all/conanfile.py b/recipes/arrow/all/conanfile.py
@@ -379,9 +379,9 @@ def package_id(self):
         self.info.options.with_grpc = self._with_grpc()
 
     def package_info(self):
+        self.cpp_info.filenames["cmake_find_package"] = "Arrow"
+        self.cpp_info.filenames["cmake_find_package_multi"] = "Arrow"
         self.cpp_info.components["libarrow"].libs = [self._lib_name("arrow")]
-        self.cpp_info.components["libarrow"].filenames["cmake_find_package"] = "Arrow"
-        self.cpp_info.components["libarrow"].filenames["cmake_find_package_multi"] = "Arrow"
         self.cpp_info.components["libarrow"].names["cmake_find_package"] = "arrow"
         self.cpp_info.components["libarrow"].names["cmake_find_package_multi"] = "arrow"
         self.cpp_info.components["libarrow"].names["pkg_config"] = "arrow"
@@ -390,32 +390,25 @@ def package_info(self):
             if self.settings.os == "Linux":
                 self.cpp_info.components["libarrow"].system_libs = ["pthread"]
 
-
         if self.options.parquet:
             self.cpp_info.components["libparquet"].libs = [self._lib_name("parquet")]
-            self.cpp_info.components["libparquet"].filenames["cmake_find_package"] = "Parquet"
-            self.cpp_info.components["libparquet"].filenames["cmake_find_package_multi"] = "Parquet"
             self.cpp_info.components["libparquet"].names["cmake_find_package"] = "parquet"
             self.cpp_info.components["libparquet"].names["cmake_find_package_multi"] = "parquet"
             self.cpp_info.components["libparquet"].names["pkg_config"] = "parquet"
             self.cpp_info.components["libparquet"].requires = ["libarrow"]
 
         if self.options.plasma:
             self.cpp_info.components["libplasma"].libs = [self._lib_name("plasma")]
-            self.cpp_info.components["libplasma"].filenames["cmake_find_package"] = "Plasma"
-            self.cpp_info.components["libplasma"].filenames["cmake_find_package_multi"] = "Arrow"
             self.cpp_info.components["libplasma"].names["cmake_find_package"] = "plasma"
             self.cpp_info.components["libplasma"].names["cmake_find_package_multi"] = "plasma"
             self.cpp_info.components["libplasma"].names["pkg_config"] = "plasma"
             self.cpp_info.components["libplasma"].requires = ["libarrow"]
 
         if self.options.gandiva:
             self.cpp_info.components["libgandiva"].libs = [self._lib_name("gandiva")]
-            self.cpp_info.components["libgandiva"].filenames["cmake_find_package"] = "Gandiva"
-            self.cpp_info.components["libgandiva"].filenames["cmake_find_package_multi"] = "Gandiva"
             self.cpp_info.components["libgandiva"].names["cmake_find_package"] = "gandiva"
-            self.cpp_info.components["libgandiva"].names["cmake_find_package_multi"] = "plasma"
-            self.cpp_info.components["libgandiva"].names["pkg_config"] = "plasma"
+            self.cpp_info.components["libgandiva"].names["cmake_find_package_multi"] = "gandiva"
+            self.cpp_info.components["libgandiva"].names["pkg_config"] = "gandiva"
             self.cpp_info.components["libgandiva"].requires = ["libarrow"]
 
         if self.options.dataset_modules:

diff --git a/recipes/arrow/all/test_package/CMakeLists.txt b/recipes/arrow/all/test_package/CMakeLists.txt
@@ -4,7 +4,9 @@ project(test_package)
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup()
 
+find_package(Arrow)
+
 add_executable(${PROJECT_NAME} test_package.cpp)
-target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS})
+target_link_libraries(${PROJECT_NAME} arrow::arrow)
 set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
 target_compile_definitions(${PROJECT_NAME} PRIVATE WITH_JEMALLOC)
diff --git a/recipes/arrow/all/test_package/conanfile.py b/recipes/arrow/all/test_package/conanfile.py
@@ -4,7 +4,7 @@
 
 class TestPackageConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
-    generators = "cmake"
+    generators = "cmake", "cmake_find_package"
 
     def build(self):
         cmake = CMake(self)