diff options
| author | codicodi <rob.ceglinski@gmail.com> | 2016-12-07 17:48:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-07 17:48:01 +0100 |
| commit | 7927112acb2ab216a8e45b13922bb78d87bd3bff (patch) | |
| tree | bc5a4133b092e77e472ac783f28964434e3679fc | |
| parent | ed2994a5e930b27fd5dbe121b35fe0abba428376 (diff) | |
| download | vcpkg-7927112acb2ab216a8e45b13922bb78d87bd3bff.tar.gz vcpkg-7927112acb2ab216a8e45b13922bb78d87bd3bff.zip | |
[libflac] link to correct version of ogg
| -rw-r--r-- | ports/libflac/CMakeLists.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ports/libflac/CMakeLists.txt b/ports/libflac/CMakeLists.txt index 2f3dedbdb..afe55f55e 100644 --- a/ports/libflac/CMakeLists.txt +++ b/ports/libflac/CMakeLists.txt @@ -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) |