mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 06:37:49 +08:00
61c055a6fc
* [brotli] add pkgconfig * [freetype] add pkgconfig and add dependency on brotli * [qt5-base] add new freetype dependency to brotli and zstd * [freetype] fix cmake paths * [freetype] removed renaming of include dir and unnecessary cmake fixes * [freetype-gl] fix glew include dir * [podofo] fix freetype search. * fixing wrong freetype stuff due to vcpkg owned wrong CMakeLists.txt ..... * fixing more freetype hidden issues. * [sfml] fix missing include * fix typo * [freetype] uncomment previous renaming of include folders * fix brotli linkage in static builds * remove added alias to avoid problems. * [freetype] add brotli to the wrapper * [lzokay] format manifest Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
74 lines
3.0 KiB
Diff
74 lines
3.0 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 2c4b757f9..eed560c1d 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -351,7 +351,7 @@ function(generate_pkg_config_path outvar path)
|
|
set("${outvar}" "${${outvar}}" PARENT_SCOPE)
|
|
endfunction(generate_pkg_config_path)
|
|
|
|
-function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION)
|
|
+function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION SHARED_TARGET STATIC_TARGET)
|
|
file(READ ${INPUT_FILE} TEXT)
|
|
|
|
set(PREFIX "${CMAKE_INSTALL_PREFIX}")
|
|
@@ -366,14 +366,21 @@ function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION)
|
|
|
|
string(REGEX REPLACE "@PACKAGE_VERSION@" "${VERSION}" TEXT ${TEXT})
|
|
|
|
+ if(BUILD_SHARED_LIBS)
|
|
+ set(LIB_NAME "${SHARED_TARGET}")
|
|
+ else()
|
|
+ set(LIB_NAME "${STATIC_TARGET}")
|
|
+ endif()
|
|
+ string(REGEX REPLACE "@lib_name@" "${LIB_NAME}" TEXT ${TEXT})
|
|
+
|
|
file(WRITE ${OUTPUT_FILE} ${TEXT})
|
|
endfunction()
|
|
|
|
-transform_pc_file("scripts/libbrotlicommon.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlicommon.pc" "${BROTLI_VERSION}")
|
|
+transform_pc_file("scripts/libbrotlicommon.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlicommon.pc" "${BROTLI_VERSION}" brotlicommon brotlicommon-static)
|
|
|
|
-transform_pc_file("scripts/libbrotlidec.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlidec.pc" "${BROTLI_VERSION}")
|
|
+transform_pc_file("scripts/libbrotlidec.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlidec.pc" "${BROTLI_VERSION}" brotlidec brotlidec-static)
|
|
|
|
-transform_pc_file("scripts/libbrotlienc.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlienc.pc" "${BROTLI_VERSION}")
|
|
+transform_pc_file("scripts/libbrotlienc.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlienc.pc" "${BROTLI_VERSION}" brotlienc brotlienc-static)
|
|
|
|
if(NOT BROTLI_BUNDLED_MODE)
|
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libbrotlicommon.pc"
|
|
diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
|
|
index 2a8cf7a35..464a21292 100644
|
|
--- a/scripts/libbrotlicommon.pc.in
|
|
+++ b/scripts/libbrotlicommon.pc.in
|
|
@@ -7,5 +7,5 @@ Name: libbrotlicommon
|
|
URL: https://github.com/google/brotli
|
|
Description: Brotli common dictionary library
|
|
Version: @PACKAGE_VERSION@
|
|
-Libs: -L${libdir} -lbrotlicommon
|
|
+Libs: -L${libdir} -l@lib_name@
|
|
Cflags: -I${includedir}
|
|
diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
|
|
index 6f8ef2e41..f87d3f65f 100644
|
|
--- a/scripts/libbrotlidec.pc.in
|
|
+++ b/scripts/libbrotlidec.pc.in
|
|
@@ -7,6 +7,6 @@ Name: libbrotlidec
|
|
URL: https://github.com/google/brotli
|
|
Description: Brotli decoder library
|
|
Version: @PACKAGE_VERSION@
|
|
-Libs: -L${libdir} -lbrotlidec
|
|
+Libs: -L${libdir} -l@lib_name@
|
|
Requires.private: libbrotlicommon >= 1.0.2
|
|
Cflags: -I${includedir}
|
|
diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
|
|
index 2098afe2c..7b6371bcb 100644
|
|
--- a/scripts/libbrotlienc.pc.in
|
|
+++ b/scripts/libbrotlienc.pc.in
|
|
@@ -7,6 +7,6 @@ Name: libbrotlienc
|
|
URL: https://github.com/google/brotli
|
|
Description: Brotli encoder library
|
|
Version: @PACKAGE_VERSION@
|
|
-Libs: -L${libdir} -lbrotlienc
|
|
+Libs: -L${libdir} -l@lib_name@
|
|
Requires.private: libbrotlicommon >= 1.0.2
|
|
Cflags: -I${includedir}
|