mirror of https://github.com/microsoft/vcpkg.git
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index d2a69d4..14fc9b8 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -159,7 +159,8 @@ if(MSVC)
|
|
endif()
|
|
endif()
|
|
|
|
-add_subdirectory(fmt-11.1.1 EXCLUDE_FROM_ALL)
|
|
+find_package(fmt CONFIG REQUIRED)
|
|
+add_library(alsoft::fmt ALIAS fmt::fmt)
|
|
|
|
|
|
set(CPP_DEFS ) # C pre-processor, not C++
|
|
@@ -1440,7 +1441,7 @@ if(LIBTYPE STREQUAL "STATIC")
|
|
add_library(${IMPL_TARGET} STATIC ${COMMON_OBJS} ${OPENAL_OBJS} ${ALC_OBJS} ${CORE_OBJS})
|
|
target_compile_definitions(${IMPL_TARGET} PUBLIC AL_LIBTYPE_STATIC)
|
|
target_link_libraries(${IMPL_TARGET} PRIVATE ${LINKER_FLAGS} ${EXTRA_LIBS} ${MATH_LIB}
|
|
- $<BUILD_LOCAL_INTERFACE:alsoft::fmt>)
|
|
+ alsoft::fmt)
|
|
|
|
if(WIN32)
|
|
# This option is for static linking OpenAL Soft into another project
|
|
diff --git a/OpenALConfig.cmake.in b/OpenALConfig.cmake.in
|
|
index 9704d3c..ddabb81 100644
|
|
--- a/OpenALConfig.cmake.in
|
|
+++ b/OpenALConfig.cmake.in
|
|
@@ -1,3 +1,5 @@
|
|
+include(CMakeFindDependencyMacro)
|
|
+find_dependency(fmt CONFIG)
|
|
cmake_minimum_required(VERSION 3.1...3.18)
|
|
|
|
include("${CMAKE_CURRENT_LIST_DIR}/OpenALTargets.cmake")
|
|
diff --git a/openal.pc.in b/openal.pc.in
|
|
index dfa6f57..e04e807 100644
|
|
--- a/openal.pc.in
|
|
+++ b/openal.pc.in
|
|
@@ -6,6 +6,7 @@ includedir=@includedir@
|
|
Name: OpenAL
|
|
Description: OpenAL is a cross-platform 3D audio API
|
|
Requires: @PKG_CONFIG_REQUIRES@
|
|
+Requires.private: fmt
|
|
Version: @PACKAGE_VERSION@
|
|
Libs: -L${libdir} -l@LIBNAME@ @PKG_CONFIG_LIBS@
|
|
Libs.private:@PKG_CONFIG_PRIVATE_LIBS@
|