mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 00:21:48 +08:00
458c20e94b
* [vcpkg/scripts/pkgconfig] rewrite pkgconfig check for libraries.
* [vcpkg/scripts/pkgconfig] fix more details.
* [vcpkg/scripts/pkgconfig] smaller improvements
* ws change to check functionallity of script for testing.
* [vcpkg/scripts/pkgconfig] update to latest test version
* Revert "ws change to check functionallity of script for testing."
This reverts commit 26269e9e77.
* [nettle] bump control for vcpkg_fixup_pkgconfig test
* [gmp] rerun CI to create new *.pc files
* [gmp/nettle] enable port debug
* [vcpkg/script/pkgconfig] fix path conversion regex for CI
* [CI|OSX] install pkg-config on osx
* [gmp/nettle] disable port debug
* [vcpkg/scripts/pkgconfig] update to latest version of x windows pr
* [zlib] add pkgconfig file
* [zstd] add fixup pkgconfig
* [libpng] add pc file installation
* [bzip2] install pc file and leave a TODO for somebody else ;)
* [bzip2] bump control
* [vcpkg/scripts/pkgconfig] skip checks if pkgconfig cannot be found.
- small bugfix in ignore flags regex
* retry zstd and zlib
* [libpng] retry by adding dl and m to system libraries for osx
* [libpng] add missing vcpkg_fixup_pkgconfig()
* [vcpkg/scripts/pkgconfig] unset var if found.
fixes checks for other configurations which will be always succesful otherwise
* [libpng] bump control
* [libpng] enable port debug to debug osx regression
* ws change to retrigger osx ci and hopeing that it works
* fix typo
* [libpng] remove -lm flag on apple platforms
* ws change to rerun some ports in ci for good measure after the merge with master
* Re-trigger CI test
* [zstd] add pkgconfig
* [zstd] correct debug link
* [vcpkg/script/pkgconfig] - add more search suffixes for static libs
- add additional debug messages for debuging
- fix unsetting of cache variables hiding issues with debug libraries
- fixed pkgconfig fix in the debug case
* [pcre] add pthread dependency to pcre
* [protobuf] fix pkgconfig
* include quotes around the prefix in the case the prefix path was quoted (fixes some regressions)
add option NOT_STATIC_PKGCONFIG to run pkg-config without the --static argument
* [ignition-msgs5] get rid of a dev warning
* [apr] fix apr regression
* [protobuf] fix protobuf regression
* [sdl1] fix regression due to variable expansion of pkg-config. Use similar regex to the library removal for ignored flags.
* [ignition] fix regression
* remove changes of zlib portfile.
* reset changes in osx ci pipeline
* add DISABLE_PARALLEL_CONFIGURE
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Billy Robert O'Neal <bion@microsoft.com>
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 6f85d17ef..8de0eb299 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -814,20 +814,31 @@ endif()
|
|
# Only do this on Windows for Cygwin - the files don't make much sense outside
|
|
# of a UNIX look-alike.
|
|
if(NOT WIN32 OR CYGWIN OR MINGW)
|
|
- set(prefix ${CMAKE_INSTALL_PREFIX})
|
|
- set(exec_prefix ${CMAKE_INSTALL_PREFIX})
|
|
- set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
|
|
- set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
|
|
- set(LIBS "-lz -lm")
|
|
+ set(LIBS "-lz")
|
|
+ if(NOT APPLE)
|
|
+ string(APPEND LIBS " -lm")
|
|
+ endif()
|
|
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in
|
|
- ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY)
|
|
- create_symlink(libpng.pc FILE ${PNGLIB_NAME}.pc)
|
|
-
|
|
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in
|
|
- ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY)
|
|
create_symlink(libpng-config FILE ${PNGLIB_NAME}-config)
|
|
+else()
|
|
+ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
|
|
+ set(LIBS "-lzlibd")
|
|
+ else()
|
|
+ set(LIBS "-lzlib")
|
|
+ endif()
|
|
endif()
|
|
|
|
+set(prefix ${CMAKE_INSTALL_PREFIX})
|
|
+set(exec_prefix ${CMAKE_INSTALL_PREFIX})
|
|
+set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
|
|
+set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
|
|
+
|
|
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in
|
|
+ ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY)
|
|
+create_symlink(libpng.pc FILE ${PNGLIB_NAME}.pc)
|
|
+
|
|
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in
|
|
+ ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY)
|
|
+
|
|
# SET UP LINKS
|
|
if(PNG_SHARED)
|
|
set_target_properties(png PROPERTIES
|