From 81bb6873f1c0291fecbf6e429ad15ac3db66a4c0 Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 12 Mar 2024 22:07:03 +0100 Subject: Legal notices updated Rename contrib -> third-party intendes to express the origin and purpose of that part of the code better. I plan to readd contrib/ again but with more in-project things like bash-completions, dev workflow scripts etc. --- third-party/libpng/3.includes.patch | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 third-party/libpng/3.includes.patch (limited to 'third-party/libpng/3.includes.patch') diff --git a/third-party/libpng/3.includes.patch b/third-party/libpng/3.includes.patch new file mode 100644 index 0000000..c48e163 --- /dev/null +++ b/third-party/libpng/3.includes.patch @@ -0,0 +1,37 @@ +diff '--color=auto' -arNu a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2024-03-03 02:11:16.832164723 +0100 ++++ b/CMakeLists.txt 2024-03-03 02:19:25.775518136 +0100 +@@ -106,7 +106,6 @@ + # Use the prebuilt pnglibconf.h file from the scripts folder + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt + ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h) +-include_directories(${CMAKE_CURRENT_BINARY_DIR}) + + # OUR SOURCES + set(libpng_public_hdrs +@@ -177,9 +176,6 @@ + add_definitions(-DPNG_NO_FLOATING_POINT_SUPPORTED) + endif() + +-# NOW BUILD OUR TARGET +-include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +- + if(PNG_SHARED) + add_library(${PNG_LIB_NAME} SHARED ${libpng_sources}) + if(MSVC) +@@ -187,6 +183,7 @@ + set_target_properties(${PNG_LIB_NAME} PROPERTIES PREFIX "lib") + set_target_properties(${PNG_LIB_NAME} PROPERTIES IMPORT_PREFIX "lib") + endif() ++ target_include_directories(${PNG_LIB_NAME} PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) + target_link_libraries(${PNG_LIB_NAME} Zlib::zlib ${M_LIBRARY}) + endif() + +@@ -198,6 +195,7 @@ + # msvc does not append 'lib' - do it here to have consistent name + set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES PREFIX "lib") + endif() ++ target_include_directories(${PNG_LIB_NAME_STATIC} PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) + target_link_libraries(${PNG_LIB_NAME_STATIC} Zlib::zlibstatic ${M_LIBRARY}) + endif() + -- cgit v1.1