You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by ta...@apache.org on 2016/05/23 15:40:33 UTC
[07/17] incubator-impala git commit: IMPALA-3223: Remove boost
multiprecision in thirdparty.
IMPALA-3223: Remove boost multiprecision in thirdparty.
Boost library header is already included in the toolchain.
Also removes the environment variable IMPALA_MIN_BOOST_VERSION
and standardizes on the boost library version in toolchain.
Change-Id: I297edac7053964bfa113e0d5bf411fa3934b3796
Reviewed-on: http://gerrit.cloudera.org:8080/3159
Reviewed-by: Michael Ho <kw...@cloudera.com>
Tested-by: Internal Jenkins
Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/9a5e7012
Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/9a5e7012
Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/9a5e7012
Branch: refs/heads/master
Commit: 9a5e7012092e85f25fcd2a51347f08cbe38bfeb8
Parents: 72e4c41
Author: Michael Ho <kw...@cloudera.com>
Authored: Fri May 20 12:24:52 2016 -0700
Committer: Tim Armstrong <ta...@cloudera.com>
Committed: Mon May 23 08:40:19 2016 -0700
----------------------------------------------------------------------
CMakeLists.txt | 9 +------
bin/impala-config.sh | 1 -
cmake_modules/FindBoostMultiPrecision.cmake | 30 ------------------------
3 files changed, 1 insertion(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/9a5e7012/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7893a1b..6451371 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,7 +141,7 @@ if (CMAKE_DEBUG)
endif()
-find_package(Boost $ENV{IMPALA_MIN_BOOST_VERSION} REQUIRED
+find_package(Boost $ENV{IMPALA_BOOST_VERSION} REQUIRED
COMPONENTS thread regex system filesystem date_time)
include_directories(${Boost_INCLUDE_DIRS})
set(LIBS ${LIBS} ${Boost_LIBRARIES})
@@ -297,13 +297,6 @@ find_package(RapidJson REQUIRED)
include_directories(${RAPIDJSON_INCLUDE_DIR})
message(STATUS "RapidJson include dir: " ${RAPIDJSON_INCLUDE_DIR})
-# find boost multi precision headers
-if (Boost_VERSION LESS 105300)
- find_package(BoostMultiPrecision REQUIRED)
- include_directories(${BOOST_MULTI_PRECISION_INCLUDE_DIR})
- message(STATUS "BoostMultiPrecision include dir: " ${BOOST_MULTI_PRECISION_INCLUDE_DIR})
-endif ()
-
# find Avro headers and libs
find_package(Avro REQUIRED)
include_directories(${AVRO_INCLUDE_DIR})
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/9a5e7012/bin/impala-config.sh
----------------------------------------------------------------------
diff --git a/bin/impala-config.sh b/bin/impala-config.sh
index 77e8b12..53ca315 100755
--- a/bin/impala-config.sh
+++ b/bin/impala-config.sh
@@ -236,7 +236,6 @@ export IMPALA_LLVM_VERSION=3.8.0
export IMPALA_LLVM_DEBUG_VERSION=3.8.0
export IMPALA_LLVM_ASAN_VERSION=3.8.0
export IMPALA_LZ4_VERSION=svn
-export IMPALA_MIN_BOOST_VERSION=1.46.0
export IMPALA_OPENLDAP_VERSION=2.4.25
export IMPALA_OPENSSL_VERSION=0.9.8zf
export IMPALA_RAPIDJSON_VERSION=0.11
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/9a5e7012/cmake_modules/FindBoostMultiPrecision.cmake
----------------------------------------------------------------------
diff --git a/cmake_modules/FindBoostMultiPrecision.cmake b/cmake_modules/FindBoostMultiPrecision.cmake
deleted file mode 100644
index 0b32823..0000000
--- a/cmake_modules/FindBoostMultiPrecision.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-# - Find Boost Multi Precision library (cpp_int.h)
-# This is a header only library so we just need to set the include dir
-
-set(BOOST_MULTI_PRECISION_SEARCH_HEADER_PATH
- $ENV{IMPALA_HOME}/thirdparty/boost_multiprecision
-)
-
-find_file(BOOST_MULTI_PRECISION_HEADER NAMES cpp_int.hpp
- PATHS ${BOOST_MULTI_PRECISION_SEARCH_HEADER_PATH}
- NO_DEFAULT_PATH
- DOC "Boost Multi Precision Library"
-)
-
-if (BOOST_MULTI_PRECISION_HEADER)
- set(BOOST_MULTI_PRECISION_FOUND TRUE)
- set(BOOST_MULTI_PRECISION_INCLUDE_DIR ${BOOST_MULTI_PRECISION_SEARCH_HEADER_PATH})
-else ()
- set(BOOST_MULTI_PRECISION_FOUND FALSE)
-endif ()
-
-if (BOOST_MULTI_PRECISION_FOUND)
- message(STATUS "Boost Multi Precision found in ${BOOST_MULTI_PRECISION_INCLUDE_DIR}")
-else ()
- message(STATUS "Boost Multip Precision NOT found. "
- "Header should be in ${BOOST_MULTI_PRECISION_SEARCH_HEADER_PATH}")
-endif ()
-
-mark_as_advanced(
- BOOST_MULTI_PRECISION_INCLUDE_DIR
-)