From 36ec61acfa7cf24e0a9d996bcf5e73fcb391728a Mon Sep 17 00:00:00 2001 From: Keith Kraus Date: Tue, 2 Aug 2022 14:02:31 -0400 Subject: [PATCH 1/2] Change cmake to allow controlling Arrow version via cmake variable (#11429) Fixes #11425 Changes the `CUDF_VERSION_Arrow` cmake variable to be a cache entry so that a user can override it by providing `-DCUDF_VERSION_Arrow` at configure time. Happy to repeat this pattern for other dependencies if desired. Authors: - Keith Kraus (https://github.com/kkraus14) Approvers: - Robert Maynard (https://github.com/robertmaynard) - Bradley Dice (https://github.com/bdice) URL: https://github.com/rapidsai/cudf/pull/11429 --- cpp/cmake/thirdparty/get_arrow.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cpp/cmake/thirdparty/get_arrow.cmake b/cpp/cmake/thirdparty/get_arrow.cmake index 116c5442dc3..e0f9a711776 100644 --- a/cpp/cmake/thirdparty/get_arrow.cmake +++ b/cpp/cmake/thirdparty/get_arrow.cmake @@ -273,7 +273,12 @@ function(find_and_configure_arrow VERSION BUILD_STATIC ENABLE_S3 ENABLE_ORC ENAB endfunction() -set(CUDF_VERSION_Arrow 8.0.0) +if(NOT DEFINED CUDF_VERSION_Arrow) + set(CUDF_VERSION_Arrow + 8.0.0 + CACHE STRING "The version of Arrow to find (or build)" + ) +endif() find_and_configure_arrow( ${CUDF_VERSION_Arrow} ${CUDF_USE_ARROW_STATIC} ${CUDF_ENABLE_ARROW_S3} ${CUDF_ENABLE_ARROW_ORC} From 4ad2afc3595154e0e282da68bcda2db3f670a72f Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Tue, 2 Aug 2022 13:03:26 -0500 Subject: [PATCH 2/2] Use documented header template for `doxygen` (#11430) This PR uses a documented template auto-generated by `doxygen` and inserts our custom js & css links to it. The process is documented here: https://doxygen.nl/manual/customize.html#minor_tweaks_header_css Authors: - GALI PREM SAGAR (https://github.com/galipremsagar) Approvers: - AJ Schmidt (https://github.com/ajschmidt8) - David Wendt (https://github.com/davidwendt) URL: https://github.com/rapidsai/cudf/pull/11430 --- cpp/doxygen/Doxyfile | 4 +-- cpp/doxygen/footer.html | 4 --- cpp/doxygen/header.html | 61 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 6 deletions(-) delete mode 100644 cpp/doxygen/footer.html create mode 100644 cpp/doxygen/header.html diff --git a/cpp/doxygen/Doxyfile b/cpp/doxygen/Doxyfile index db625156815..dcae5bcae8c 100644 --- a/cpp/doxygen/Doxyfile +++ b/cpp/doxygen/Doxyfile @@ -1146,7 +1146,7 @@ HTML_FILE_EXTENSION = .html # of the possible markers and block names see the documentation. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_HEADER = +HTML_HEADER = header.html # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each # generated HTML page. If the tag is left blank doxygen will generate a standard @@ -1156,7 +1156,7 @@ HTML_HEADER = # that doxygen normally uses. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_FOOTER = footer.html +HTML_FOOTER = # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style # sheet that is used by each HTML page. It can be used to fine-tune the look of diff --git a/cpp/doxygen/footer.html b/cpp/doxygen/footer.html deleted file mode 100644 index 9bd79eeb539..00000000000 --- a/cpp/doxygen/footer.html +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/cpp/doxygen/header.html b/cpp/doxygen/header.html new file mode 100644 index 00000000000..569b8450e3a --- /dev/null +++ b/cpp/doxygen/header.html @@ -0,0 +1,61 @@ + + + + + + + + +$projectname: $title +$title + + + +$treeview +$search +$mathjax + +$extrastylesheet + + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + +
+
$projectname +  $projectnumber +
+
$projectbrief
+ 		+
$projectbrief
+ 		$searchbox
+
+ +