From 74a13823441b42f075f82cda189c8231803a0c42 Mon Sep 17 00:00:00 2001 From: Ingo Wald Date: Sun, 2 Jan 2022 13:11:57 -0700 Subject: [PATCH 1/2] added public target-includes that provide the proper include paths for any project useing this as a git submodule --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 98c0a1a..37f390d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,6 +75,7 @@ file(GLOB lzo_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.c") list(SORT lzo_SOURCES) # LZO library + if(NOT DEFINED lzo_USE_OBJECT_LIB) if(ENABLE_STATIC AND ENABLE_SHARED) if(CMAKE_POSITION_INDEPENDENT_CODE OR MSVC) @@ -97,6 +98,10 @@ if(ENABLE_STATIC) list(APPEND lzo_COMPILE_TARGETS lzo_static_lib) endif() set_target_properties(lzo_static_lib PROPERTIES OUTPUT_NAME lzo2) + target_include_directories(lzo_static_lib PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/minilzo + ${CMAKE_CURRENT_SOURCE_DIR}/include/lzo + ) endif() if(ENABLE_SHARED) if(lzo_USE_OBJECT_LIB) From adf17a8166399e63a5c69a07e30b342b178e4a83 Mon Sep 17 00:00:00 2001 From: Ingo Wald Date: Sun, 2 Jan 2022 15:08:46 -0700 Subject: [PATCH 2/2] also adding include to includes --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37f390d..593c2e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,6 +100,7 @@ if(ENABLE_STATIC) set_target_properties(lzo_static_lib PROPERTIES OUTPUT_NAME lzo2) target_include_directories(lzo_static_lib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/minilzo + ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include/lzo ) endif()