Merge pull request #6602 from lioncash/xxhash

CMakeLists: Don't dump xxhash's includes into top-level directory scope
dolphin-emu · Apr 7, 2018 · bb38b61 · bb38b61
2 parents 7dff069 + a4ba92c
commit bb38b61
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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})