From 83506617f978c6a0848947b484d756fc3914633d Mon Sep 17 00:00:00 2001 From: Dmitri Tikhonov Date: Thu, 20 Feb 2020 17:00:23 -0500 Subject: [PATCH] Set lshpack include directory in the library's Makefile --- CMakeLists.txt | 2 +- src/liblsquic/CMakeLists.txt | 1 + test/unittests/CMakeLists.txt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 176ff10..21ee437 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,7 +159,7 @@ ELSE() ENDIF() SET(CMAKE_INCLUDE_CURRENT_DIR ON) -INCLUDE_DIRECTORIES(include src/lshpack) +INCLUDE_DIRECTORIES(include) IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") # Find libevent on FreeBSD: include_directories( /usr/local/include ) diff --git a/src/liblsquic/CMakeLists.txt b/src/liblsquic/CMakeLists.txt index 856238d..bd9f8ad 100644 --- a/src/liblsquic/CMakeLists.txt +++ b/src/liblsquic/CMakeLists.txt @@ -87,6 +87,7 @@ include_directories(ls-qpack) IF(PROJECT_NAME STREQUAL "openlitespeed") INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/spdy) ELSE() + INCLUDE_DIRECTORIES(../lshpack) SET(lsquic_STAT_SRCS ${lsquic_STAT_SRCS} lsquic_xxhash.c ../lshpack/lshpack.c diff --git a/test/unittests/CMakeLists.txt b/test/unittests/CMakeLists.txt index c69e9ad..67a21b0 100644 --- a/test/unittests/CMakeLists.txt +++ b/test/unittests/CMakeLists.txt @@ -19,6 +19,7 @@ ELSE() ENDIF() include_directories(../../src/liblsquic/ls-qpack) +INCLUDE_DIRECTORIES(../../src/lshpack) SET(TESTS ack