Repository: arrow Updated Branches: refs/heads/master ab848f0ea -> fd876697f
ARROW-684: [Python] More helpful error message if libparquet_arrow not built Author: Wes McKinney <[email protected]> Closes #443 from wesm/ARROW-684 and squashes the following commits: c18ca81 [Wes McKinney] More helpful error message if libparquet_arrow not built Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/fd876697 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/fd876697 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/fd876697 Branch: refs/heads/master Commit: fd876697fc37a270a978117f020bf9e07a6c1bad Parents: ab848f0 Author: Wes McKinney <[email protected]> Authored: Sun Mar 26 09:21:15 2017 +0200 Committer: Uwe L. Korn <[email protected]> Committed: Sun Mar 26 09:21:15 2017 +0200 ---------------------------------------------------------------------- python/cmake_modules/FindParquet.cmake | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/fd876697/python/cmake_modules/FindParquet.cmake ---------------------------------------------------------------------- diff --git a/python/cmake_modules/FindParquet.cmake b/python/cmake_modules/FindParquet.cmake index 7445e09..a20b651 100644 --- a/python/cmake_modules/FindParquet.cmake +++ b/python/cmake_modules/FindParquet.cmake @@ -68,13 +68,21 @@ else () set(PARQUET_ARROW_FOUND FALSE) endif () -if (PARQUET_FOUND) +if (PARQUET_FOUND AND PARQUET_ARROW_FOUND) if (NOT Parquet_FIND_QUIETLY) message(STATUS "Found the Parquet library: ${PARQUET_LIBRARIES}") + message(STATUS "Found the Parquet Arrow library: ${PARQUET_ARROW_LIBS}") endif () else () if (NOT Parquet_FIND_QUIETLY) - set(PARQUET_ERR_MSG "Could not find the Parquet library. Looked in ") + if (NOT PARQUET_FOUND) + set(PARQUET_ERR_MSG "${PARQUET_ERR_MSG} Could not find the parquet library.") + endif() + + if (NOT PARQUET_ARROW_FOUND) + set(PARQUET_ERR_MSG "${PARQUET_ERR_MSG} Could not find the parquet_arrow library. Did you build with -DPARQUET_ARROW=on?") + endif() + set(PARQUET_ERR_MSG "${PARQUET_ERR_MSG} Looked in ") if ( _parquet_roots ) set(PARQUET_ERR_MSG "${PARQUET_ERR_MSG} in ${_parquet_roots}.") else () @@ -88,12 +96,6 @@ else () endif () endif () -if (PARQUET_ARROW_FOUND) - if (NOT Parquet_FIND_QUIETLY) - message(STATUS "Found the Parquet Arrow library: ${PARQUET_ARROW_LIBS}") - endif() -endif() - mark_as_advanced( PARQUET_FOUND PARQUET_INCLUDE_DIR
