Detect arrow 0.16 as well as 0.14

aphecetche · ktf · commit f2c3df4c8233 · 2020-04-22T20:59:57.000+02:00
diff --git a/dependencies/FindO2arrow.cmake b/dependencies/FindO2arrow.cmake
@@ -0,0 +1,38 @@
+# Copyright CERN and copyright holders of ALICE O2. This software is distributed
+# under the terms of the GNU General Public License v3 (GPL Version 3), copied
+# verbatim in the file "COPYING".
+#
+# See http://alice-o2.web.cern.ch/license for full licensing information.
+#
+# In applying this license CERN does not waive the privileges and immunities
+# granted to it by virtue of its status as an Intergovernmental Organization or
+# submit itself to any jurisdiction.
+
+# Simply provide a namespaced alias for the existing target
+
+find_package(Arrow CONFIG QUIET)
+if(NOT Arrow_FOUND)
+        find_package(arrow CONFIG QUIET)
+        set(Arrow_DIR ${arrow_DIR})
+endif()
+find_package(Gandiva CONFIG PATHS ${Arrow_DIR} QUIET)
+
+if(TARGET arrow_shared)
+        # Promote the imported target to global visibility (so we can alias it)
+        set_target_properties(arrow_shared PROPERTIES IMPORTED_GLOBAL TRUE)
+        add_library(arrow::arrow_shared ALIAS arrow_shared)
+        set(arrow_TARGET ON)
+endif()
+
+if(TARGET gandiva_shared)
+        # Promote the imported target to global visibility (so we can alias it)
+        set_target_properties(gandiva_shared PROPERTIES IMPORTED_GLOBAL TRUE)
+        add_library(arrow::gandiva_shared ALIAS gandiva_shared)
+        set(gandiva_TARGET ON)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(O2arrow REQUIRED_VARS arrow_TARGET gandiva_TARGET)
+
+unset(arrow_TARGET)
+unset(gandiva_TARGET)
diff --git a/dependencies/Findarrow.cmake b/dependencies/Findarrow.cmake
diff --git a/dependencies/O2Dependencies.cmake b/dependencies/O2Dependencies.cmake
@@ -36,8 +36,8 @@ include(FeatureSummary)
 
 include(FindThreads)
 
-find_package(arrow MODULE)
-set_package_properties(arrow PROPERTIES TYPE REQUIRED)
+find_package(O2arrow MODULE)
+set_package_properties(O2arrow PROPERTIES TYPE REQUIRED)
 
 find_package(Vc)
 set_package_properties(Vc PROPERTIES TYPE REQUIRED)
