From 0d48009f343850c76e94763d12c24d6ca7042e87 Mon Sep 17 00:00:00 2001 From: Martin Grund Date: Tue, 21 Jul 2015 13:23:47 -0700 Subject: [PATCH] Making CMake modules more modular for non-toolchain build This patch makes sure that the Impala-lzo build can pickup the cmake modules from Impala to avoid code duplication on the lzo side. Change-Id: I7917946724ce4bfaa281e708e9ea5799b4e2cd37 Reviewed-on: http://gerrit.cloudera.org:8080/552 Reviewed-by: Martin Grund Tested-by: Internal Jenkins --- cmake_modules/FindAvro.cmake | 4 ++-- cmake_modules/FindBoostMultiPrecision.cmake | 3 +-- cmake_modules/FindGFlags.cmake | 4 ++-- cmake_modules/FindGLog.cmake | 2 +- cmake_modules/FindGTest.cmake | 6 +++--- cmake_modules/FindLdap.cmake | 4 ++-- cmake_modules/FindLz4.cmake | 4 ++-- cmake_modules/FindMustache.cmake | 4 ++-- cmake_modules/FindPProf.cmake | 4 ++-- cmake_modules/FindRapidJson.cmake | 2 +- cmake_modules/FindRe2.cmake | 4 ++-- cmake_modules/FindSasl.cmake | 4 ++-- cmake_modules/FindSnappy.cmake | 4 ++-- cmake_modules/FindSqueasel.cmake | 4 ++-- 14 files changed, 26 insertions(+), 27 deletions(-) diff --git a/cmake_modules/FindAvro.cmake b/cmake_modules/FindAvro.cmake index 6ea07ac84d2..aa060d61110 100644 --- a/cmake_modules/FindAvro.cmake +++ b/cmake_modules/FindAvro.cmake @@ -6,11 +6,11 @@ # avro - static library set(AVRO_SEARCH_HEADER_PATHS ${AVRO_ROOT}/include - ${CMAKE_SOURCE_DIR}/thirdparty/avro-c-$ENV{IMPALA_AVRO_VERSION}/src) + $ENV{IMPALA_HOME}/thirdparty/avro-c-$ENV{IMPALA_AVRO_VERSION}/src) set(AVRO_SEARCH_LIB_PATH ${AVRO_ROOT}/lib - ${CMAKE_SOURCE_DIR}/thirdparty/avro-c-$ENV{IMPALA_AVRO_VERSION}/src) + $ENV{IMPALA_HOME}/thirdparty/avro-c-$ENV{IMPALA_AVRO_VERSION}/src) find_path(AVRO_INCLUDE_DIR NAMES avro/schema.h schema.h PATHS ${AVRO_SEARCH_HEADER_PATHS} diff --git a/cmake_modules/FindBoostMultiPrecision.cmake b/cmake_modules/FindBoostMultiPrecision.cmake index 3db20a3a3e9..0b32823836c 100644 --- a/cmake_modules/FindBoostMultiPrecision.cmake +++ b/cmake_modules/FindBoostMultiPrecision.cmake @@ -2,7 +2,7 @@ # This is a header only library so we just need to set the include dir set(BOOST_MULTI_PRECISION_SEARCH_HEADER_PATH - ${CMAKE_SOURCE_DIR}/thirdparty/boost_multiprecision + $ENV{IMPALA_HOME}/thirdparty/boost_multiprecision ) find_file(BOOST_MULTI_PRECISION_HEADER NAMES cpp_int.hpp @@ -28,4 +28,3 @@ endif () mark_as_advanced( BOOST_MULTI_PRECISION_INCLUDE_DIR ) - diff --git a/cmake_modules/FindGFlags.cmake b/cmake_modules/FindGFlags.cmake index 1276dcd8a45..c17a2b164e6 100644 --- a/cmake_modules/FindGFlags.cmake +++ b/cmake_modules/FindGFlags.cmake @@ -9,12 +9,12 @@ set(GFLAGS_SEARCH_HEADER_PATHS ${GFLAGS_ROOT}/include - ${CMAKE_SOURCE_DIR}/thirdparty/gflags-$ENV{IMPALA_GFLAGS_VERSION}/src + $ENV{IMPALA_HOME}/thirdparty/gflags-$ENV{IMPALA_GFLAGS_VERSION}/src ) set(GFLAGS_SEARCH_LIB_PATH ${GFLAGS_ROOT}/lib - ${CMAKE_SOURCE_DIR}/thirdparty/gflags-$ENV{IMPALA_GFLAGS_VERSION}/.libs + $ENV{IMPALA_HOME}/thirdparty/gflags-$ENV{IMPALA_GFLAGS_VERSION}/.libs ) find_path(GFLAGS_INCLUDE_DIR gflags/gflags.h PATHS diff --git a/cmake_modules/FindGLog.cmake b/cmake_modules/FindGLog.cmake index 36bb93fc1dc..7e0025c4adc 100644 --- a/cmake_modules/FindGLog.cmake +++ b/cmake_modules/FindGLog.cmake @@ -7,7 +7,7 @@ # GLOG_STATIC_LIB, path to libglog.a # glogstatic -set(THIRDPARTY ${CMAKE_SOURCE_DIR}/thirdparty) +set(THIRDPARTY $ENV{IMPALA_HOME}/thirdparty) set(GLOG_SEARCH_HEADER_PATHS ${GLOG_ROOT}/include diff --git a/cmake_modules/FindGTest.cmake b/cmake_modules/FindGTest.cmake index 76605764dc7..9fb043391a1 100644 --- a/cmake_modules/FindGTest.cmake +++ b/cmake_modules/FindGTest.cmake @@ -37,21 +37,21 @@ set(GTEST_H gtest/gtest.h) find_path(GTEST_INCLUDE_DIR ${GTEST_H} PATHS ${GTEST_ROOT}/include - ${CMAKE_SOURCE_DIR}/thirdparty/gtest-1.6.0/include + $ENV{IMPALA_HOME}/thirdparty/gtest-1.6.0/include NO_DEFAULT_PATH DOC "Path to the ${GTEST_H} file" ) find_library(GTEST_LIBRARY NAMES gtest PATHS ${GTEST_ROOT}/lib - ${CMAKE_SOURCE_DIR}/thirdparty/gtest-1.6.0 + $ENV{IMPALA_HOME}/thirdparty/gtest-1.6.0 NO_DEFAULT_PATH DOC "Google's framework for writing C++ tests (gtest)" ) find_library(GTEST_MAIN_LIBRARY NAMES gtest_main PATHS ${GTEST_ROOT}/lib - ${CMAKE_SOURCE_DIR}/thirdparty/gtest-1.6.0 + $ENV{IMPALA_HOME}/thirdparty/gtest-1.6.0 NO_DEFAULT_PATH DOC "Google's framework for writing C++ tests (gtest_main)" ) diff --git a/cmake_modules/FindLdap.cmake b/cmake_modules/FindLdap.cmake index c81a574f594..41ea3eeea19 100644 --- a/cmake_modules/FindLdap.cmake +++ b/cmake_modules/FindLdap.cmake @@ -7,9 +7,9 @@ # LBER_STATIC_LIBRARY, a support library for LDAP. # ldapstatic, lberstatic, imported libraries -set(THIRDPARTY_LDAP thirdparty/openldap-$ENV{IMPALA_OPENLDAP_VERSION}) +set(THIRDPARTY_LDAP $ENV{IMPALA_HOME}/thirdparty/openldap-$ENV{IMPALA_OPENLDAP_VERSION}) -set (THIRDPARTY ${CMAKE_SOURCE_DIR}/thirdparty) +set(THIRDPARTY $ENV{IMPALA_HOME}/thirdparty) set(LDAP_SEARCH_LIB_PATH ${OPENLDAP_ROOT}/lib ${THIRDPARTY}/openldap-$ENV{IMPALA_OPENLDAP_VERSION}/impala_install/lib diff --git a/cmake_modules/FindLz4.cmake b/cmake_modules/FindLz4.cmake index 7e5757f27e3..fe2cfa492f8 100644 --- a/cmake_modules/FindLz4.cmake +++ b/cmake_modules/FindLz4.cmake @@ -9,12 +9,12 @@ set(LZ4_SEARCH_LIB_PATH ${LZ4_ROOT}/lib - ${CMAKE_SOURCE_DIR}/thirdparty/lz4 + $ENV{IMPALA_HOME}/thirdparty/lz4 ) set(LZ4_SEARCH_INCLUDE_DIR ${LZ4_ROOT}/include - ${CMAKE_SOURCE_DIR}/thirdparty/lz4 + $ENV{IMPALA_HOME}/thirdparty/lz4 ) find_path(LZ4_INCLUDE_DIR lz4.h diff --git a/cmake_modules/FindMustache.cmake b/cmake_modules/FindMustache.cmake index cd1ef4b9abb..3a9dc6d4fe6 100644 --- a/cmake_modules/FindMustache.cmake +++ b/cmake_modules/FindMustache.cmake @@ -4,8 +4,8 @@ # MUSTACHE_SRC_DIR, directory containing source # MUSTACHE_FOUND, whether the Mustache library has been located -find_path(MUSTACHE_INCLUDE_DIR mustache/mustache.h HINTS ${CMAKE_SOURCE_DIR}/thirdparty) -find_path(MUSTACHE_SRC_DIR mustache.cc HINTS ${CMAKE_SOURCE_DIR}/thirdparty/mustache) +find_path(MUSTACHE_INCLUDE_DIR mustache/mustache.h HINTS $ENV{IMPALA_HOME}/thirdparty) +find_path(MUSTACHE_SRC_DIR mustache.cc HINTS $ENV{IMPALA_HOME}/thirdparty/mustache) if (MUSTACHE_INCLUDE_DIR) set(MUSTACHE_FOUND TRUE) diff --git a/cmake_modules/FindPProf.cmake b/cmake_modules/FindPProf.cmake index 1f8851d06c8..2d3fa9f3a5c 100644 --- a/cmake_modules/FindPProf.cmake +++ b/cmake_modules/FindPProf.cmake @@ -9,12 +9,12 @@ set(PPROF_SEARCH_HEADER_PATHS ${GPERFTOOLS_ROOT}/include - ${CMAKE_SOURCE_DIR}/thirdparty/gperftools-2.0/src + $ENV{IMPALA_HOME}/thirdparty/gperftools-2.0/src ) set(PPROF_SEARCH_LIB_PATH ${GPERFTOOLS_ROOT}/lib - ${CMAKE_SOURCE_DIR}/thirdparty/gperftools-2.0/.libs + $ENV{IMPALA_HOME}/thirdparty/gperftools-2.0/.libs ) find_path(PPROF_INCLUDE_DIR google/profiler.h PATHS diff --git a/cmake_modules/FindRapidJson.cmake b/cmake_modules/FindRapidJson.cmake index 699aeec2801..c69ff5dfc1c 100644 --- a/cmake_modules/FindRapidJson.cmake +++ b/cmake_modules/FindRapidJson.cmake @@ -4,7 +4,7 @@ set(RAPIDJSON_SEARCH_HEADER_PATHS ${RAPIDJSON_ROOT}/include - ${CMAKE_SOURCE_DIR}/thirdparty/rapidjson/include/ + $ENV{IMPALA_HOME}/thirdparty/rapidjson/include/ ) find_path(RAPIDJSON_INCLUDE_DIR rapidjson/rapidjson.h HINTS diff --git a/cmake_modules/FindRe2.cmake b/cmake_modules/FindRe2.cmake index c7bb528dc4a..6eb38eaabfb 100644 --- a/cmake_modules/FindRe2.cmake +++ b/cmake_modules/FindRe2.cmake @@ -7,12 +7,12 @@ set(RE2_SEARCH_HEADER_PATHS ${RE2_ROOT}/include - ${CMAKE_SOURCE_DIR}/thirdparty/re2 + $ENV{IMPALA_HOME}/thirdparty/re2 ) set(RE2_SEARCH_LIB_PATHS ${RE2_ROOT}/lib - ${CMAKE_SOURCE_DIR}/thirdparty/re2/obj + $ENV{IMPALA_HOME}/thirdparty/re2/obj ) find_path(RE2_INCLUDE_DIR re2/re2.h diff --git a/cmake_modules/FindSasl.cmake b/cmake_modules/FindSasl.cmake index d5836521ebb..9f7c20e1265 100644 --- a/cmake_modules/FindSasl.cmake +++ b/cmake_modules/FindSasl.cmake @@ -5,9 +5,9 @@ # SASL_STATIC_LIBRARY, the library to use # saslstatic - imported static library -set(THIRDPARTY_SASL thirdparty/cyrus-sasl-$ENV{IMPALA_CYRUS_SASL_VERSION}) +set(THIRDPARTY_SASL $ENV{IMPALA_HOME}/thirdparty/cyrus-sasl-$ENV{IMPALA_CYRUS_SASL_VERSION}) -set (THIRDPARTY ${CMAKE_SOURCE_DIR}/thirdparty) +set(THIRDPARTY $ENV{IMPALA_HOME}/thirdparty) set(SASL_SEARCH_LIB_PATH ${CYRUS_SASL_ROOT}/lib diff --git a/cmake_modules/FindSnappy.cmake b/cmake_modules/FindSnappy.cmake index d93db146bb5..e55d342b009 100644 --- a/cmake_modules/FindSnappy.cmake +++ b/cmake_modules/FindSnappy.cmake @@ -10,12 +10,12 @@ set(SNAPPY_SEARCH_HEADER_PATHS ${SNAPPY_ROOT}/include - ${CMAKE_SOURCE_DIR}/thirdparty/snappy-1.0.5/build/include + $ENV{IMPALA_HOME}/thirdparty/snappy-1.0.5/build/include ) set(SNAPPY_SEARCH_LIB_PATH ${SNAPPY_ROOT}/lib - ${CMAKE_SOURCE_DIR}/thirdparty/snappy-1.0.5/build/lib + $ENV{IMPALA_HOME}/thirdparty/snappy-1.0.5/build/lib ) find_path(SNAPPY_INCLUDE_DIR diff --git a/cmake_modules/FindSqueasel.cmake b/cmake_modules/FindSqueasel.cmake index 624929dbafd..ea738e6ae16 100644 --- a/cmake_modules/FindSqueasel.cmake +++ b/cmake_modules/FindSqueasel.cmake @@ -3,8 +3,8 @@ # SQUEASEL_INCLUDE_DIR, directory containing headers # SQUEASEL_SRC_DIR, directory containing source -find_path(SQUEASEL_INCLUDE_DIR squeasel/squeasel.h HINTS ${CMAKE_SOURCE_DIR}/thirdparty) -find_path(SQUEASEL_SRC_DIR squeasel.c HINTS ${CMAKE_SOURCE_DIR}/thirdparty/squeasel) +find_path(SQUEASEL_INCLUDE_DIR squeasel/squeasel.h HINTS $ENV{IMPALA_HOME}/thirdparty) +find_path(SQUEASEL_SRC_DIR squeasel.c HINTS $ENV{IMPALA_HOME}/thirdparty/squeasel) if (SQUEASEL_INCLUDE_DIR) set(SQUEASEL_FOUND TRUE)