From d637b9022af1f58cfe664e0332dc4b6dd38789a9 Mon Sep 17 00:00:00 2001
From: evpobr <evpobr@gmail.com>
Date: Sun, 26 Jan 2020 18:11:01 +0500
Subject: [PATCH] cmake - Fix CMake install include directory
Install include directory must be `include/opus`, not `include`.
Old path is still here for compatibility.
Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>
---
CMakeLists.txt | 1 +
OpusConfig.cmake.in | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d147075c..f5325348b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,6 +187,7 @@ target_include_directories(
opus
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/opus>
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
celt
diff --git a/OpusConfig.cmake.in b/OpusConfig.cmake.in
index 15771743a..0b21231d4 100644
--- a/OpusConfig.cmake.in
+++ b/OpusConfig.cmake.in
@@ -7,7 +7,8 @@ set(OPUS_VERSION_PATCH @PROJECT_VERSION_PATCH@)
@PACKAGE_INIT@
set_and_check(OPUS_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
-set_and_check(OPUS_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@")
+set(OPUS_INCLUDE_DIR ${OPUS_INCLUDE_DIR};${OPUS_INCLUDE_DIR}/opus)
+set(OPUS_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@;@PACKAGE_INCLUDE_INSTALL_DIR@/opus")
include(${CMAKE_CURRENT_LIST_DIR}/OpusTargets.cmake)
--
GitLab