Merge pull request #6638 from lioncash/lzo

CMakeLists: Don't dump LZO's includes into the top-level directory
dolphin-emu · Apr 13, 2018 · 48242f1 · 48242f1
2 parents b84806e + 7de2d1c
commit 48242f1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -585,7 +585,6 @@ if(LZO_FOUND)
 else()
   message(STATUS "Using static lzo from Externals")
   add_subdirectory(Externals/LZO)
-  include_directories(Externals/LZO)
   set(LZO lzo2)
 endif()
 

diff --git a/Externals/LZO/CMakeLists.txt b/Externals/LZO/CMakeLists.txt
@@ -1 +1,8 @@
-add_library(lzo2 STATIC minilzo.c)
+add_library(lzo2 STATIC
+  minilzo.c
+)
+
+target_include_directories(lzo2
+PUBLIC
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)