mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 13:13:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[libflac] link to correct version of ogg

Browse Source
This commit is contained in:
codicodi 2016-12-07 17:48:01 +01:00 committed by GitHub
parent ed2994a5e9
commit 7927112acb
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ports/libflac/CMakeLists.txt
View File

@ -3,10 +3,6 @@ cmake_policy(SET CMP0005 NEW) # do not escape preprocessor defines
project(libflac)
if(NOT DEFINED LIBFLAC_OGG_LIB OR NOT DEFINED LIBFLAC_OGG_INCLUDES)
message(FATAL_ERROR "Ogg library required")
endif()
if(NOT DEFINED LIBFLAC_ARCHITECTURE)
message(FATAL_ERROR "Target architecture not specified")
endif()
@ -20,7 +16,6 @@ file(GLOB LIBFLACXX_SOURCES
include_directories(${PROJECT_SOURCE_DIR}/include)
include_directories(${PROJECT_SOURCE_DIR}/src/libFLAC/include)
include_directories(${LIBFLAC_OGG_INCLUDES})
if(NOT LIBFLAC_ARCHITECTURE MATCHES arm)
add_definitions(-DFLAC__SSE_OS)
@ -49,7 +44,11 @@ add_library(libFLACXX ${LIBFLACXX_SOURCES})
set_target_properties(libFLAC PROPERTIES OUTPUT_NAME flac)
set_target_properties(libFLACXX PROPERTIES OUTPUT_NAME flac++)
target_link_libraries(libFLAC ${LIBFLAC_OGG_LIB})
find_library(OGG_LIBRARY ogg)
find_path(OGG_INCLUDE_DIR ogg/ogg.h)
include_directories(${OGG_INCLUDE_DIR})
target_link_libraries(libFLAC ${OGG_LIBRARY})
target_link_libraries(libFLACXX libFLAC)
if(BUILD_SHARED_LIBS)