ref: d637b9022af1f58cfe664e0332dc4b6dd38789a9
parent: 94b68f341cadd5433a10d346c1c248a641d8be57
author: evpobr <evpobr@gmail.com>
date: Sun Jan 26 13:11:01 EST 2020
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>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,6 +187,7 @@
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
--- a/OpusConfig.cmake.in
+++ b/OpusConfig.cmake.in
@@ -7,7 +7,8 @@
@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)