From 9c1cdebcffa2fb9797d664e6d9cd6c110fe57db6 Mon Sep 17 00:00:00 2001 From: Aki Date: Wed, 29 Sep 2021 22:54:02 +0200 Subject: Integrated ogg and vorbis into cmake root --- vorbis/lib/CMakeLists.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'vorbis/lib') diff --git a/vorbis/lib/CMakeLists.txt b/vorbis/lib/CMakeLists.txt index e808e77..387ce25 100644 --- a/vorbis/lib/CMakeLists.txt +++ b/vorbis/lib/CMakeLists.txt @@ -69,7 +69,6 @@ endif() include_directories(../include) include_directories(.) -include_directories(${OGG_INCLUDE_DIRS}) if (NOT BUILD_FRAMEWORK) add_library(vorbis ${VORBIS_HEADERS} ${VORBIS_SOURCES}) @@ -83,9 +82,13 @@ if (NOT BUILD_FRAMEWORK) get_version_info(VORBISFILE_VERSION_INFO "VF_LIB_CURRENT" "VF_LIB_AGE" "VF_LIB_REVISION") set_target_properties(vorbisfile PROPERTIES SOVERSION ${VORBISFILE_VERSION_INFO}) - target_link_libraries(vorbis ${OGG_LIBRARIES}) - target_link_libraries(vorbisenc ${OGG_LIBRARIES} vorbis) - target_link_libraries(vorbisfile ${OGG_LIBRARIES} vorbis) + target_link_libraries(vorbis Ogg::ogg) + target_link_libraries(vorbisenc Ogg::ogg vorbis) + target_link_libraries(vorbisfile Ogg::ogg vorbis) + + add_library(Vorbis::vorbis ALIAS vorbis) + add_library(Vorbis::vorbisenc ALIAS vorbisenc) + add_library(Vorbis::vorbisfile ALIAS vorbisfile) install(FILES ${VORBIS_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/vorbis) -- cgit v1.1