testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity
f32623e73e
cmake/cmake-fix-png-include-dir.patch

24 lines
947 B
Diff
Raw Normal View History

Accepting request 992207 from home:polslinux:branches:devel:tools:building - Update to 3.23.3: * This version made no changes to documented features or interfaces. Some implementation updates were made to support ecosystem changes and/or fix regressions. - Rebase cmake-fix-ruby-test.patch - Rebase cmake-fix-png-include-dir.patch OBS-URL: https://build.opensuse.org/request/show/992207 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=496
2022-08-02 11:12:12 +02:00
Index: cmake-3.23.3/Modules/FindPNG.cmake
Accepting request 795139 from home:vyermolc:root - Add cmake-fix-png-include-dir.patch to fix the libpng include dir search. OpenSUSE uses %{_includedir}/libpng%{branch} format, so cmake can`t find it. OBS-URL: https://build.opensuse.org/request/show/795139 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=408
2020-04-18 08:51:17 +02:00
===================================================================
Accepting request 992207 from home:polslinux:branches:devel:tools:building - Update to 3.23.3: * This version made no changes to documented features or interfaces. Some implementation updates were made to support ecosystem changes and/or fix regressions. - Rebase cmake-fix-ruby-test.patch - Rebase cmake-fix-png-include-dir.patch OBS-URL: https://build.opensuse.org/request/show/992207 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=496
2022-08-02 11:12:12 +02:00
--- cmake-3.23.3.orig/Modules/FindPNG.cmake
+++ cmake-3.23.3/Modules/FindPNG.cmake
@@ -54,12 +54,16 @@ endif()
Accepting request 795139 from home:vyermolc:root - Add cmake-fix-png-include-dir.patch to fix the libpng include dir search. OpenSUSE uses %{_includedir}/libpng%{branch} format, so cmake can`t find it. OBS-URL: https://build.opensuse.org/request/show/795139 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=408
2020-04-18 08:51:17 +02:00
find_package(ZLIB ${_FIND_ZLIB_ARG})
if(ZLIB_FOUND)
- find_path(PNG_PNG_INCLUDE_DIR png.h PATH_SUFFIXES include/libpng)
+ set(_PNG_VERSION_SUFFIXES 17 16 15 14 12)
+ foreach(v IN LISTS _PNG_VERSION_SUFFIXES)
+ list(APPEND _PNG_INCLUDE_SUFFIXES libpng${v})
+ endforeach()
+ find_path(PNG_PNG_INCLUDE_DIR png.h PATH_SUFFIXES include/libpng ${_PNG_INCLUDE_SUFFIXES})
+ unset(_PNG_INCLUDE_SUFFIXES)
Accepting request 880861 from home:mathletic:branches:devel:tools:building Update to 3.20.0 OBS-URL: https://build.opensuse.org/request/show/880861 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=453
2021-03-24 08:59:14 +01:00
mark_as_advanced(PNG_PNG_INCLUDE_DIR)
Accepting request 795139 from home:vyermolc:root - Add cmake-fix-png-include-dir.patch to fix the libpng include dir search. OpenSUSE uses %{_includedir}/libpng%{branch} format, so cmake can`t find it. OBS-URL: https://build.opensuse.org/request/show/795139 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=408
2020-04-18 08:51:17 +02:00
list(APPEND PNG_NAMES png libpng)
unset(PNG_NAMES_DEBUG)
- set(_PNG_VERSION_SUFFIXES 17 16 15 14 12)
if (PNG_FIND_VERSION MATCHES "^([0-9]+)\\.([0-9]+)(\\..*)?$")
set(_PNG_VERSION_SUFFIX_MIN "${CMAKE_MATCH_1}${CMAKE_MATCH_2}")
if (PNG_FIND_VERSION_EXACT)
Copy Permalink