From 68bb0e21a3c057e3e9df0b4861edd893809fcbba Mon Sep 17 00:00:00 2001 From: Dominik Charousset Date: Sat, 21 Sep 2019 11:46:06 +0200 Subject: [PATCH] Fix overly specific include_directories usage Calling `find_package(CAF)` puts all include directory paths into a single variable. Picking the paths individually is not only error prone and cumbersome, but can also lead to bulid errors. For example, when using a build directory for CAF_ROOT then CAF_INCLUDE_DIRS will have one extra path to find CAF's `config.hpp` (which is part of the build directory). --- CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9473ba1130..a1587bf529 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -366,9 +366,7 @@ endif () # CAF headers aren't necessarily in same location as Broker headers and # inclusion of a Broker header may pull in CAF headers. -include_directories(BEFORE ${CAF_INCLUDE_DIR_CORE}) -include_directories(BEFORE ${CAF_INCLUDE_DIR_IO}) -include_directories(BEFORE ${CAF_INCLUDE_DIR_OPENSSL}) +include_directories(BEFORE ${CAF_INCLUDE_DIRS}) add_subdirectory(aux/paraglob) set(zeekdeps ${zeekdeps} paraglob)