Merge pull request #6638 from lioncash/lzo

CMakeLists: Don't dump LZO's includes into the top-level directory
2018-04-13 20:28:44 +02:00 · 2018-04-13 20:28:44 +02:00 · 48242f1521
parent b84806ed8d 7de2d1c9d6
commit 48242f1521
2 changed files with 8 additions and 2 deletions
--- 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()

--- 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}
+)