jprdonnelly/impala
1
0
Fork 0
mirror of https://github.com/apache/impala.git synced 2025-12-19 18:12:08 -05:00
Code Issues Projects Releases Wiki Activity

IMPALA-10933: Impala build finds system libcurl instead of toolchain version

Browse Source 
This patch modifies FindCurl.cmake to ignore the system version
of libcurl. Without this patch the build might find a wrong
version of libcurl which causes errors during link time.

Change-Id: I3c2d315e9bc06b9b926a492fa8d3729baddc2c82
Reviewed-on: http://gerrit.cloudera.org:8080/17876
Reviewed-by: Wenzhe Zhou <wzhou@cloudera.com>
Tested-by: Impala Public Jenkins <impala-public-jenkins@cloudera.com>
This commit is contained in:
Zoltan Borok-Nagy
2021-09-28 12:01:42 +02:00
committed by Impala Public Jenkins
parent 444fedbfda
commit b45cd1bf02
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmake_modules/FindCurl.cmake
View File

@@ -34,8 +34,17 @@ find_path(CURL_INCLUDE_DIR NAMES curl/curl.h PATHS
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
find_library(CURL_STATIC_LIB NAMES libcurl.a PATHS ${CURL_SEARCH_LIB_PATH}) find_library(CURL_STATIC_LIB NAMES libcurl.a PATHS
find_library(CURL_SHARED_LIB NAMES libcurl.so PATHS ${CURL_SEARCH_LIB_PATH}) ${CURL_SEARCH_LIB_PATH}
# make sure we don't accidentally pick up a different version
NO_DEFAULT_PATH
)
find_library(CURL_SHARED_LIB NAMES libcurl.so PATHS
${CURL_SEARCH_LIB_PATH}
# make sure we don't accidentally pick up a different version
NO_DEFAULT_PATH
)
if (NOT CURL_INCLUDE_DIR OR NOT CURL_STATIC_LIB) if (NOT CURL_INCLUDE_DIR OR NOT CURL_STATIC_LIB)
message(FATAL_ERROR "Curl includes and libraries NOT found. " message(FATAL_ERROR "Curl includes and libraries NOT found. "