diff options
| author | Vitaliy Kirsanov <krokoziabla@yandex-team.ru> | 2019-04-07 12:37:56 +0300 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2019-05-04 11:41:48 +1000 |
| commit | 6cd2b6cded1d7281df7584d7fad9ccb1d1022243 (patch) | |
| tree | 5014375b784a5337cf9688edf0fd446a3878c16e /src | |
| parent | c39718d7a36405114f9ed0b1a7acaef64ea88131 (diff) | |
| download | flac-6cd2b6cded1d7281df7584d7fad9ccb1d1022243.tar.gz | |
FindOGG.cmake module added
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/libFLAC/CMakeLists.txt | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7de7a7fa..f6577467 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,13 +1,8 @@ cmake_minimum_required(VERSION 3.12) option(ENABLE_64_BIT_WORDS "Set FLAC__BYTES_PER_WORD to 8 (4 is the default)" OFF) -option(WITH_OGG "ogg support (default: test for libogg)" ON) option(WITH_XMMS "Build XMMS plugin" OFF) -if(WITH_OGG) - find_package(OGG REQUIRED) -endif() - check_include_file("iconv.h" HAVE_ICONV_H) add_compile_definitions( diff --git a/src/libFLAC/CMakeLists.txt b/src/libFLAC/CMakeLists.txt index 1ea9383a..13f14751 100644 --- a/src/libFLAC/CMakeLists.txt +++ b/src/libFLAC/CMakeLists.txt @@ -102,9 +102,16 @@ target_include_directories(FLAC-static INTERFACE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>" "$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>") target_link_libraries(FLAC-static PUBLIC - $<TARGET_NAME_IF_EXISTS:Ogg::Ogg> + $<TARGET_NAME_IF_EXISTS:Ogg::Ogg-static> $<TARGET_NAME_IF_EXISTS:FLAC-asm> $<$<BOOL:${HAVE_LROUND}>:m>) +if(TARGET Ogg::Ogg-static) + target_link_libraries(FLAC-static PUBLIC + $<TARGET_NAME_IF_EXISTS:Ogg::Ogg-static>) +elseif(TARGET Ogg::Ogg) + target_link_libraries(FLAC-static PUBLIC + $<TARGET_NAME_IF_EXISTS:Ogg::Ogg>) +endif() add_library(FLAC SHARED ${SOURCES}) target_compile_definitions(FLAC PRIVATE FLAC_API_EXPORTS FLAC__USE_VISIBILITY_ATTR) @@ -112,6 +119,7 @@ target_include_directories(FLAC INTERFACE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>" "$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>") target_link_libraries(FLAC PRIVATE + $<TARGET_NAME_IF_EXISTS:Ogg::Ogg> $<TARGET_NAME_IF_EXISTS:FLAC-asm> $<$<BOOL:${HAVE_LROUND}>:m>) set_target_properties(FLAC PROPERTIES C_VISIBILITY_PRESET hidden) |