diff options
| author | 2017-05-29 15:12:21 -0700 | |
|---|---|---|
| committer | 2017-05-29 15:12:21 -0700 | |
| commit | a4f88c7d7c94107df6bfada31617ff553bb5e89e (patch) | |
| tree | cb0d3adbbe115604051300ae451a22a4de751b27 /src/audio_core | |
| parent | Merge pull request #2729 from yuriks/quaternion-fix (diff) | |
| parent | CMake: Re-organize root CMakeLists.txt file (diff) | |
| download | yuzu-a4f88c7d7c94107df6bfada31617ff553bb5e89e.tar.gz yuzu-a4f88c7d7c94107df6bfada31617ff553bb5e89e.tar.xz yuzu-a4f88c7d7c94107df6bfada31617ff553bb5e89e.zip | |
Merge pull request #2734 from yuriks/cmake-imported-libs
CMake: Use CMake target properties for all libraries
Diffstat (limited to 'src/audio_core')
| -rw-r--r-- | src/audio_core/CMakeLists.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt index c571213fc..0ad86bb7a 100644 --- a/src/audio_core/CMakeLists.txt +++ b/src/audio_core/CMakeLists.txt | |||
| @@ -27,12 +27,9 @@ set(HEADERS | |||
| 27 | time_stretch.h | 27 | time_stretch.h |
| 28 | ) | 28 | ) |
| 29 | 29 | ||
| 30 | include_directories(../../externals/soundtouch/include) | ||
| 31 | |||
| 32 | if(SDL2_FOUND) | 30 | if(SDL2_FOUND) |
| 33 | set(SRCS ${SRCS} sdl2_sink.cpp) | 31 | set(SRCS ${SRCS} sdl2_sink.cpp) |
| 34 | set(HEADERS ${HEADERS} sdl2_sink.h) | 32 | set(HEADERS ${HEADERS} sdl2_sink.h) |
| 35 | include_directories(${SDL2_INCLUDE_DIR}) | ||
| 36 | endif() | 33 | endif() |
| 37 | 34 | ||
| 38 | create_directory_groups(${SRCS} ${HEADERS}) | 35 | create_directory_groups(${SRCS} ${HEADERS}) |
| @@ -42,6 +39,6 @@ target_link_libraries(audio_core PUBLIC common core) | |||
| 42 | target_link_libraries(audio_core PRIVATE SoundTouch) | 39 | target_link_libraries(audio_core PRIVATE SoundTouch) |
| 43 | 40 | ||
| 44 | if(SDL2_FOUND) | 41 | if(SDL2_FOUND) |
| 45 | target_link_libraries(audio_core PRIVATE ${SDL2_LIBRARY}) | 42 | target_link_libraries(audio_core PRIVATE SDL2) |
| 46 | target_compile_definitions(audio_core PRIVATE HAVE_SDL2) | 43 | target_compile_definitions(audio_core PRIVATE HAVE_SDL2) |
| 47 | endif() | 44 | endif() |