Skip to content

Commit 557aea8

Browse files
committed
build(cmake): Avoid overwriting include directories
- Adds guard-checks against overwriting include directories passed as flags/inherited by cmake. - Also adds find_files hints for linuxbrex directories (homebrew for linux)
1 parent a146d10 commit 557aea8

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,21 @@ if (NOT BUILD_OPTION_DOC_ONLY)
4141
#---------------------------
4242
if (DEFINED ENV{LIBRDKAFKA_INCLUDE_DIR})
4343
set(LIBRDKAFKA_INCLUDE_DIR $ENV{LIBRDKAFKA_INCLUDE_DIR})
44-
else ()
44+
elseif (NOT DEFINED LIBRDKAFKA_INCLUDE_DIR)
4545
find_file(LIBRDKAFKA_HEADER
4646
NAMES rdkafka.h
47-
HINTS /usr/include/librdkafka /usr/local/include/librdkafka /opt/homebrew/include/librdkafka)
47+
HINTS /usr/include/librdkafka /usr/local/include/librdkafka /opt/homebrew/include/librdkafka /home/linuxbrew/.linuxbrew/include/librdkafka)
4848

4949
cmake_path(GET LIBRDKAFKA_HEADER PARENT_PATH LIBRDKAFKA_INCLUDE_DIR)
5050
cmake_path(GET LIBRDKAFKA_INCLUDE_DIR PARENT_PATH LIBRDKAFKA_INCLUDE_DIR)
5151
endif ()
5252

5353
if (DEFINED ENV{LIBRDKAFKA_LIBRARY_DIR})
5454
set(LIBRDKAFKA_LIBRARY_DIR $ENV{LIBRDKAFKA_LIBRARY_DIR})
55-
else ()
55+
elseif (NOT DEFINED LIBRDKAFKA_LIBRARY_DIR)
5656
find_library(LIBRDKAFKA_LIB
5757
NAMES rdkafka
58-
HINTS /usr/lib /usr/local/lib /opt/homebrew/lib)
58+
HINTS /usr/lib /usr/local/lib /opt/homebrew/lib /home/linuxbrew/.linuxbrew/lib)
5959

6060
cmake_path(GET LIBRDKAFKA_LIB PARENT_PATH LIBRDKAFKA_LIBRARY_DIR)
6161
endif ()
@@ -106,7 +106,7 @@ if (NOT BUILD_OPTION_DOC_ONLY)
106106
if (CMAKE_CXX_STANDARD EQUAL 14)
107107
if (DEFINED ENV{BOOST_ROOT})
108108
set(Boost_INCLUDE_DIRS $ENV{BOOST_ROOT}/include)
109-
else ()
109+
elseif (NOT DEFINED Boost_INCLUDE_DIRS)
110110
find_package(Boost)
111111
if (NOT Boost_FOUND)
112112
message(FATAL_ERROR "Cound not find library: boost!")

0 commit comments

Comments
 (0)