This is an automated email from the ASF dual-hosted git repository.
michaelsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
The following commit(s) were added to refs/heads/master by this push:
new 96d49b603 [tools] Include DEBUG_NOOPT when flagging DEBUG
96d49b603 is described below
commit 96d49b603aa2eacc8d5907ec1b7ed759fa4b47cf
Author: Michael Smith <[email protected]>
AuthorDate: Wed Sep 27 16:43:29 2023 -0700
[tools] Include DEBUG_NOOPT when flagging DEBUG
Updates CMakeLists.txt to consider both DEBUG_NOOPT and DEBUG when
selecting Kudu and LLVM library versions.
Change-Id: Ida62e152325c61cad69a80ccb9b917289509f018
Reviewed-on: http://gerrit.cloudera.org:8080/20518
Reviewed-by: Impala Public Jenkins <[email protected]>
Tested-by: Impala Public Jenkins <[email protected]>
---
CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7559ebfc6..755d31bc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -255,6 +255,7 @@ find_package(LlvmBinaries REQUIRED)
# Find LLVM libraries to link against.
if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG"
+ OR "${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG_NOOPT"
OR "${CMAKE_BUILD_TYPE}" STREQUAL "ADDRESS_SANITIZER"
OR "${CMAKE_BUILD_TYPE}" STREQUAL "TIDY"
OR "${CMAKE_BUILD_TYPE}" STREQUAL "UBSAN"
@@ -462,7 +463,7 @@ endif()
if(NOT $ENV{KUDU_CLIENT_DIR} EQUAL "")
set(kuduClient_DIR "$ENV{KUDU_CLIENT_DIR}/usr/local/share/kuduClient/cmake")
else()
- if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
+ if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG" OR "${CMAKE_BUILD_TYPE}" STREQUAL
"DEBUG_NOOPT")
set(kuduClient_DIR "$ENV{IMPALA_KUDU_HOME}/debug/share/kuduClient/cmake")
else()
set(kuduClient_DIR "$ENV{IMPALA_KUDU_HOME}/release/share/kuduClient/cmake")
