Skip to content

[lodepng] Update to commit e34ac0@2020-03-15 #10427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan-shaw merged 4 commits into from
Mar 28, 2020
Merged

[lodepng] Update to commit e34ac0@2020-03-15 #10427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cee9624
[lodepng] Add cmake import configs
BurningEnlightenment Mar 15, 2020
20d2dc6
[lodepng] Update to commit e34ac0@2020-03-15
BurningEnlightenment Mar 15, 2020
9a0518f
[lodepng] Modernize port
BurningEnlightenment Mar 16, 2020
fe4430c
[lodepng] Remove osx failure from ci.baseline
BurningEnlightenment Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 7 additions & 21 deletions ports/lodepng/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,17 @@
cmake_minimum_required(VERSION 3.8.0)
project(lodepng)

if(MSVC)
add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
endif()

include_directories(".")

add_library(lodepng lodepng.cpp lodepng_util.cpp)
target_include_directories(lodepng PUBLIC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)

# add_executable(pngdetail pngdetail.cpp)

# target_link_libraries(pngdetail lodepng)
file(WRITE "${CMAKE_BINARY_DIR}/lodepng-config.cmake" "include(\"\${CMAKE_CURRENT_LIST_DIR}/lodepng-targets.cmake\")")
install(FILES "${CMAKE_BINARY_DIR}/lodepng-config.cmake" DESTINATION "share/lodepng/")

install(
TARGETS lodepng
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
install(TARGETS lodepng EXPORT lodepng-targets)

# if(NOT DISABLE_INSTALL_TOOLS)
# install (
# TARGETS pngdetail
# RUNTIME DESTINATION tools/lodepng
# )
# endif()
install(EXPORT lodepng-targets DESTINATION share/lodepng/)

if(NOT DDISABLE_INSTALL_EXAMPLES)
install(DIRECTORY examples DESTINATION share/lodepng/)
Expand Down
2 changes: 1 addition & 1 deletion ports/lodepng/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: lodepng
Version: 2018-09-18-2
Version: 2020-03-15
Homepage: https://github.com/lvandeve/lodepng
Description: PNG encoder and decoder in C and C++
12 changes: 0 additions & 12 deletions ports/lodepng/algorithm.patch
View file
Open in desktop

This file was deleted.

12 changes: 5 additions & 7 deletions ports/lodepng/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
include(vcpkg_common_functions)

vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO lvandeve/lodepng
REF ceb6b482b5a16d2bb3d6b3c735ca2b16322780d5
SHA512 5293f6c629ff006410c9180cabac5f4de7643f04ec6c3d7ff46c1b09317ff9156d28ed4344a46db0b3a06937349590aa8958722ba0432178a347da58736cbf41
REF e34ac04553e51a6982ae234d98ce6b76dd57a6a1
SHA512 ab79fb2c6403e5d7bdf0b94a3f93f6513889eda8e6b74fb2b569fbc6f95fb79474654818cb0e71eff88214ca7c42ebd7c95f734a2faa77259fe06bfddcb6967a
HEAD_REF master
PATCHES algorithm.patch
)

file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
Expand All @@ -25,7 +23,7 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_copy_pdbs()

vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/lodepng)
# Moves all .cmake files from /debug/share/lodepng/ to /share/lodepng/
vcpkg_fixup_cmake_targets()


file(INSTALL ${SOURCE_PATH}/lodepng.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/lodepng RENAME copyright)
file(INSTALL ${SOURCE_PATH}/lodepng.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
1 change: 0 additions & 1 deletion scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,7 +1006,6 @@ llvm:x64-osx=ignore
lmdb:arm64-windows=fail
lmdb:arm-uwp=fail
lmdb:x64-uwp=fail
lodepng:x64-osx=fail
log4cplus:arm-uwp=fail
log4cplus:x64-uwp=fail
log4cpp:arm-uwp=fail
Expand Down