diff options
| author | Aki <please@ignore.pl> | 2024-03-03 12:51:03 +0100 |
|---|---|---|
| committer | Aki <please@ignore.pl> | 2024-03-03 12:51:03 +0100 |
| commit | 8e94244f86e657e4113e35438e59cf5771882b25 (patch) | |
| tree | b4a84a732f7f29abc8b6a129f51e406c101e7f77 /contrib/libpng | |
| parent | dad0e8562c8e5994fcf2ebedac5a7ec920297d1f (diff) | |
| download | starshatter-8e94244f86e657e4113e35438e59cf5771882b25.zip starshatter-8e94244f86e657e4113e35438e59cf5771882b25.tar.gz starshatter-8e94244f86e657e4113e35438e59cf5771882b25.tar.bz2 | |
libogg and libvorbis are no longer part of this source tree
Diffstat (limited to 'contrib/libpng')
| -rw-r--r-- | contrib/libpng/4.aliases.patch | 19 | ||||
| -rw-r--r-- | contrib/libpng/CMakeLists.txt | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/contrib/libpng/4.aliases.patch b/contrib/libpng/4.aliases.patch new file mode 100644 index 0000000..14d81d4 --- /dev/null +++ b/contrib/libpng/4.aliases.patch @@ -0,0 +1,19 @@ +diff '--color=auto' -arNu a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2024-03-03 12:45:31.540235890 +0100 ++++ b/CMakeLists.txt 2024-03-03 12:46:11.986903772 +0100 +@@ -185,6 +185,7 @@ + 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}) ++ add_library(Png::png ALIAS ${PNG_LIB_NAME}) + endif() + + if(PNG_STATIC) +@@ -197,6 +198,7 @@ + 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}) ++ add_library(Png::pngstatic ALIAS ${PNG_LIB_NAME_STATIC}) + endif() + + diff --git a/contrib/libpng/CMakeLists.txt b/contrib/libpng/CMakeLists.txt index b35c5d7..c8aafb6 100644 --- a/contrib/libpng/CMakeLists.txt +++ b/contrib/libpng/CMakeLists.txt @@ -7,4 +7,5 @@ FetchContent_Declare( PATCH_COMMAND ${CMAKE_COMMAND} -D "PATCH_FILE=${CMAKE_CURRENT_SOURCE_DIR}/1.zlib.patch" -P ${PATCH_SCRIPT} PATCH_COMMAND ${CMAKE_COMMAND} -D "PATCH_FILE=${CMAKE_CURRENT_SOURCE_DIR}/2.export.patch" -P ${PATCH_SCRIPT} PATCH_COMMAND ${CMAKE_COMMAND} -D "PATCH_FILE=${CMAKE_CURRENT_SOURCE_DIR}/3.includes.patch" -P ${PATCH_SCRIPT} + PATCH_COMMAND ${CMAKE_COMMAND} -D "PATCH_FILE=${CMAKE_CURRENT_SOURCE_DIR}/4.aliases.patch" -P ${PATCH_SCRIPT} DOWNLOAD_EXTRACT_TIMESTAMP No) |