diff options
| author | Marcus Asteborg <maastebo@microsoft.com> | 2020-04-22 20:17:57 -0700 |
|---|---|---|
| committer | Mark Harris <mark.hsj@gmail.com> | 2020-06-13 00:20:46 -0700 |
| commit | 7f01183834af62890252b09e0f8cdc0b89220dec (patch) | |
| tree | 216dd2f7cad6fe1f49f3c6447a039566405a4fd3 | |
| parent | b2547017bd87e8e6cb56aa5c3a1a54491f72cab6 (diff) | |
| download | opus-7f01183834af62890252b09e0f8cdc0b89220dec.tar.gz | |
cmake - add headers to project
Signed-off-by: Mark Harris <mark.hsj@gmail.com>
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | opus_sources.cmake | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b475835d..312105a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -230,7 +230,7 @@ set(Opus_PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/include/opus_projection.h ${CMAKE_CURRENT_SOURCE_DIR}/include/opus_types.h) -add_library(opus ${opus_sources} ${opus_sources_float} ${Opus_PUBLIC_HEADER}) +add_library(opus ${opus_headers} ${opus_sources} ${opus_sources_float} ${Opus_PUBLIC_HEADER}) add_library(Opus::opus ALIAS opus) set_target_properties(opus @@ -288,8 +288,8 @@ if(BUILD_SHARED_LIBS) endif() endif() -add_sources_group(opus silk ${silk_sources}) -add_sources_group(opus celt ${celt_sources}) +add_sources_group(opus silk ${silk_headers} ${silk_sources}) +add_sources_group(opus celt ${celt_headers} ${celt_sources}) if(OPUS_FIXED_POINT) add_sources_group(opus silk ${silk_sources_fixed}) diff --git a/opus_sources.cmake b/opus_sources.cmake index 225543af..032e574f 100644 --- a/opus_sources.cmake +++ b/opus_sources.cmake @@ -1,5 +1,6 @@ include(opus_functions.cmake) +get_opus_sources(SILK_HEAD silk_headers.mk silk_headers) get_opus_sources(SILK_SOURCES silk_sources.mk silk_sources) get_opus_sources(SILK_SOURCES_FLOAT silk_sources.mk silk_sources_float) get_opus_sources(SILK_SOURCES_FIXED silk_sources.mk silk_sources_fixed) @@ -11,9 +12,11 @@ get_opus_sources(SILK_SOURCES_ARM_NEON_INTR silk_sources.mk get_opus_sources(SILK_SOURCES_FIXED_ARM_NEON_INTR silk_sources.mk silk_sources_fixed_arm_neon_intr) +get_opus_sources(OPUS_HEAD opus_headers.mk opus_headers) get_opus_sources(OPUS_SOURCES opus_sources.mk opus_sources) get_opus_sources(OPUS_SOURCES_FLOAT opus_sources.mk opus_sources_float) +get_opus_sources(CELT_HEAD celt_headers.mk celt_headers) get_opus_sources(CELT_SOURCES celt_sources.mk celt_sources) get_opus_sources(CELT_SOURCES_SSE celt_sources.mk celt_sources_sse) get_opus_sources(CELT_SOURCES_SSE2 celt_sources.mk celt_sources_sse2) |