From a4ba92c697951644687869122b779c9a5ad195e1 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 6 Apr 2018 10:26:48 -0400 Subject: [PATCH] CMakeLists: Don't dump xxhash's includes into top-level directory scope We already use a custom CMakeLists file for xxhash, so we can just make it's headers public as part of its target interface. This way, only libraries that link in the xxhash target will see its headers, as opposed to every target under the top-level directory. --- CMakeLists.txt | 1 - Externals/xxhash/CMakeLists.txt | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 972b756f70..6a1a6f94ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -566,7 +566,6 @@ endif() if(NOT XXHASH_FOUND) message(STATUS "Using static xxhash from Externals") add_subdirectory(Externals/xxhash) - include_directories(Externals/xxhash) endif() find_package(ZLIB) diff --git a/Externals/xxhash/CMakeLists.txt b/Externals/xxhash/CMakeLists.txt index 475d2ca43a..8218f801d8 100644 --- a/Externals/xxhash/CMakeLists.txt +++ b/Externals/xxhash/CMakeLists.txt @@ -1,7 +1,7 @@ project(xxhash C) -set(SRCS - xxhash.c +add_library(xxhash STATIC xxhash.c) +target_include_directories(xxhash +PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} ) - -add_library(xxhash STATIC ${SRCS})