mirror of
https://github.com/apache/impala.git
synced 2025-12-19 18:12:08 -05:00
d79e01ef9f
If Impala was built with --build_shared_libs, some thirdparty libraries were still statically linked; this could cause runtime errors if the libraries were also linked into a .so. This patch fixes that issue (for gflags, glog and protobuf at least) by ensuring that build_shared_libs is respected for those libraries. * Standardize thirdparty library handling w/CMake by adding IMPALA_ADD_THIRDPARTY_LIB. This creates a symbolic name for each library, allowing us to switch the underlying library files (e.g. change from static to dynamic linking) without having to individually change the link clauses for each target. * Remove most cases of add_library() from cmake_modules/* - that is all handled by IMPALA_ADD_THIRDPARTY_LIB. * Add shared library detection for a couple of thirdparty dependencies (many only detect static libraries), just to prove the concept. * All thirdparty libraries now print a standard set of messages. For example: -- ----------> Adding thirdparty library protoc. <---------- -- Header files: /data/henry/src/cloudera/impala-toolchain/protobuf-2.6.1/include -- Added shared library dependency protoc: /data/henry/src/cloudera/impala-toolchain/protobuf-2.6.1/lib/libprotoc.so -- ----------> Adding thirdparty library libev. <---------- -- Header files: /data/henry/src/cloudera/impala-toolchain/libev-4.20/include -- Added shared library dependency libev: /data/henry/src/cloudera/impala-toolchain/libev-4.20/lib/libev.so * Some libraries don't quite fit this pattern (LLVM and Boost) - leave them as is for now. * Remove FindOpenSSL.cmake - the toolchain one is more modern. Change-Id: Ib7a6bc5610aaf2450f91348d94cfb984c6a4b78d Reviewed-on: http://gerrit.cloudera.org:8080/7418 Tested-by: Impala Public Jenkins Reviewed-by: Tim Armstrong <tarmstrong@cloudera.com>
67 lines
2.0 KiB
CMake
67 lines
2.0 KiB
CMake
##############################################################################
|
|
# Licensed to the Apache Software Foundation (ASF) under one
|
|
# or more contributor license agreements. See the NOTICE file
|
|
# distributed with this work for additional information
|
|
# regarding copyright ownership. The ASF licenses this file
|
|
# to you under the Apache License, Version 2.0 (the
|
|
# "License"); you may not use this file except in compliance
|
|
# with the License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing,
|
|
# software distributed under the License is distributed on an
|
|
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
# KIND, either express or implied. See the License for the
|
|
# specific language governing permissions and limitations
|
|
# under the License.
|
|
##############################################################################
|
|
|
|
# ZLIB_ROOT hints the location
|
|
# Provides
|
|
# - ZLIB,
|
|
# - ZLIB_LIBRARIES,
|
|
# - ZLIB_STATIC,
|
|
# - ZLIB_SHARED
|
|
# - ZLIB_FOUND
|
|
|
|
set(_ZLIB_SEARCH_DIR)
|
|
if (ZLIB_ROOT)
|
|
set(_ZLIB_SEARCH_DIR PATHS ${ZLIB_ROOT} NO_DEFAULT_PATH)
|
|
endif()
|
|
|
|
find_path(ZLIB_INCLUDE_DIR zlib.h ${_ZLIB_SEARCH_DIR}
|
|
PATH_SUFFIXES include)
|
|
|
|
find_library(ZLIB_STATIC_LIBRARIES libz.a
|
|
${_ZLIB_SEARCH_DIR} PATH_SUFFIXES lib lib64)
|
|
find_library(ZLIB_SHARED_LIBRARIES libz.so
|
|
${_ZLIB_SEARCH_DIR} PATH_SUFFIXES lib lib64)
|
|
|
|
if (ZLIB_STATIC_LIBRARIES AND ZLIB_SHARED_LIBRARIES)
|
|
set(ZLIB_FOUND ON)
|
|
else()
|
|
message(FATAL_ERROR "zlib headers and libraries NOT found. "
|
|
"Looked for both ${_ZLIB_SEARCH_DIR}.")
|
|
set(ZLIB_FOUND OFF)
|
|
endif()
|
|
|
|
set(ZLIB_NAMES z zlib zdll zlib1 zlibd zlibd1)
|
|
find_library(ZLIB_LIBRARIES ${ZLIB_NAMES}
|
|
${_ZLIB_SEARCH_DIR} PATH_SUFFIXES lib lib64)
|
|
|
|
if (NOT ZLIB_LIBRARIES AND NOT ZLIB_STATIC_LIBRARIES)
|
|
message(FATAL_ERROR "zlib not found in ${ZLIB_ROOT}")
|
|
set(ZLIB_FOUND FALSE)
|
|
else()
|
|
message(STATUS "Zlib: ${ZLIB_INCLUDE_DIR}")
|
|
set(ZLIB_FOUND TRUE)
|
|
endif()
|
|
|
|
mark_as_advanced(
|
|
ZLIB_INCLUDE_DIR
|
|
ZLIB_LIBRARIES
|
|
ZLIB_STATIC
|
|
ZLIB_STATIC_FOUND
|
|
)
|