mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 03:10:57 +08:00
3bc5ff7f7a
* [juce] add port for JUCE * [juce] install linux dependencies in ci * [juce] fix tool installation and cleaning * [juce] fix freetype includes for juce graphics * [juce] fix freetype includes for juceaide * [juce] simplify the freetype find check * [juce] use find_path in addition for freetype * [juce] allow setting freetype usage for juceaide * [juce] forward freetype setting + guard with option * [juce] do not use freetype for console apps * [juce] freetype is needed for console apps on Linux * [juce] link freetype on Linux for juce_build_tools * [juce] forward-vcpkg-toolchain for Builder * [juce] fix linux dependencies + forward vcpkg args * [juce] fix installation of juce tools and juce extra tools * [juce] use jack2 only on Linux * [juce] add docs for targets and descriptions * [juce] fix installation path references in CMake * [juce] do not move Cmake files + fix tool install dir * [juce] remove libwebkit2gtk-4.0-dev from ci * [juce] add ONLY_STATIC_LIBRARY to the port for windows * [juce] fix the CMake path installation paths * Revert "[juce] add ONLY_STATIC_LIBRARY to the port for windows" This reverts commit 0eb5c6f1c6baa48cebf03b6bd36641528582d5ff. * [juce] improve linux dependencies find/linkage * [juce] remove libxcomposite-dev from vm
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
diff --git a/extras/Build/CMake/JUCEModuleSupport.cmake b/extras/Build/CMake/JUCEModuleSupport.cmake
|
|
index e18dd5e08..45cc9245f 100644
|
|
--- a/extras/Build/CMake/JUCEModuleSupport.cmake
|
|
+++ b/extras/Build/CMake/JUCEModuleSupport.cmake
|
|
@@ -353,6 +353,29 @@ function(_juce_create_pkgconfig_target name)
|
|
return()
|
|
endif()
|
|
|
|
+ # The package that can be found via find_package instead of pkg-config
|
|
+ if("${name}" STREQUAL "freetype2")
|
|
+ find_package(Freetype REQUIRED)
|
|
+ add_library(juce::pkgconfig_${name} INTERFACE)
|
|
+ target_link_libraries(juce::pkgconfig_${name} INTERFACE Freetype::Freetype)
|
|
+ return()
|
|
+ elseif("${name}" STREQUAL "libcurl")
|
|
+ find_package(CURL REQUIRED)
|
|
+ add_library(juce::pkgconfig_${name} INTERFACE)
|
|
+ target_link_libraries(juce::pkgconfig_${name} INTERFACE CURL::libcurl)
|
|
+ return()
|
|
+ elseif("${name}" STREQUAL "alsa")
|
|
+ find_package(ALSA REQUIRED)
|
|
+ add_library(juce::pkgconfig_${name} INTERFACE)
|
|
+ target_link_libraries(juce::pkgconfig_${name} INTERFACE ALSA::ALSA)
|
|
+ return()
|
|
+ elseif("${name}" STREQUAL "gl")
|
|
+ find_package(OpenGL REQUIRED)
|
|
+ add_library(juce::pkgconfig_${name} INTERFACE)
|
|
+ target_link_libraries(juce::pkgconfig_${name} INTERFACE OpenGL::GL)
|
|
+ return()
|
|
+ endif()
|
|
+
|
|
find_package(PkgConfig REQUIRED)
|
|
pkg_check_modules(${name} ${ARGN})
|
|
|
|
--
|
|
2.34.1
|