From cee96246518c6c4bbfeb176ccb116519d6085047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20S=2E=20Ga=C3=9Fmann?= Date: Sun, 15 Mar 2020 17:53:08 +0100 Subject: [PATCH 1/4] [lodepng] Add cmake import configs --- ports/lodepng/CMakeLists.txt | 21 +++++++++------------ ports/lodepng/CONTROL | 2 +- ports/lodepng/portfile.cmake | 5 +++++ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ports/lodepng/CMakeLists.txt b/ports/lodepng/CMakeLists.txt index 5da3aed3d6a79a..5f02c63775be97 100644 --- a/ports/lodepng/CMakeLists.txt +++ b/ports/lodepng/CMakeLists.txt @@ -1,24 +1,21 @@ 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 + $ +) # add_executable(pngdetail pngdetail.cpp) # target_link_libraries(pngdetail lodepng) -install( - TARGETS lodepng - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) +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 EXPORT lodepng-targets) + +install(EXPORT lodepng-targets DESTINATION share/lodepng/) # if(NOT DISABLE_INSTALL_TOOLS) # install ( diff --git a/ports/lodepng/CONTROL b/ports/lodepng/CONTROL index 16d0cb794309e4..6f215a9e3aa7b5 100644 --- a/ports/lodepng/CONTROL +++ b/ports/lodepng/CONTROL @@ -1,4 +1,4 @@ Source: lodepng -Version: 2018-09-18-2 +Version: 2018-09-18-3 Homepage: https://github.com/lvandeve/lodepng Description: PNG encoder and decoder in C and C++ diff --git a/ports/lodepng/portfile.cmake b/ports/lodepng/portfile.cmake index 83df5a5e01dcd0..386f7662d276ae 100644 --- a/ports/lodepng/portfile.cmake +++ b/ports/lodepng/portfile.cmake @@ -25,7 +25,12 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +# Moves all .cmake files from /debug/share/lodepng/ to /share/lodepng/ +vcpkg_fixup_cmake_targets() + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/lodepng) file(INSTALL ${SOURCE_PATH}/lodepng.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/lodepng RENAME copyright) + +vcpkg_test_cmake(PACKAGE_NAME lodepng) From 20d2dc610bb1e7c2a358122560de4339fe70fad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20S=2E=20Ga=C3=9Fmann?= Date: Sun, 15 Mar 2020 18:02:14 +0100 Subject: [PATCH 2/4] [lodepng] Update to commit e34ac0@2020-03-15 --- ports/lodepng/CONTROL | 2 +- ports/lodepng/algorithm.patch | 12 ------------ ports/lodepng/portfile.cmake | 5 ++--- 3 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 ports/lodepng/algorithm.patch diff --git a/ports/lodepng/CONTROL b/ports/lodepng/CONTROL index 6f215a9e3aa7b5..b9238548f926f8 100644 --- a/ports/lodepng/CONTROL +++ b/ports/lodepng/CONTROL @@ -1,4 +1,4 @@ Source: lodepng -Version: 2018-09-18-3 +Version: 2020-03-15 Homepage: https://github.com/lvandeve/lodepng Description: PNG encoder and decoder in C and C++ diff --git a/ports/lodepng/algorithm.patch b/ports/lodepng/algorithm.patch deleted file mode 100644 index 796bdfc66c049a..00000000000000 --- a/ports/lodepng/algorithm.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/lodepng_util.cpp b/lodepng_util.cpp -index 4b571bb..58ba81a 100644 ---- a/lodepng_util.cpp -+++ b/lodepng_util.cpp -@@ -26,6 +26,7 @@ freely, subject to the following restrictions: - #include "lodepng_util.h" - #include - #include "math.h" -+#include - - namespace lodepng - { diff --git a/ports/lodepng/portfile.cmake b/ports/lodepng/portfile.cmake index 386f7662d276ae..de63b8122ac78e 100644 --- a/ports/lodepng/portfile.cmake +++ b/ports/lodepng/portfile.cmake @@ -5,10 +5,9 @@ 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}) From 9a0518fcdbef0a66a7e37bbafb65379ebaa84aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20S=2E=20Ga=C3=9Fmann?= Date: Mon, 16 Mar 2020 08:05:15 +0100 Subject: [PATCH 3/4] [lodepng] Modernize port - Remove calls to deprecated vcpkg functions. - Remove commented out pngdetail tool project definitions. --- ports/lodepng/CMakeLists.txt | 11 ----------- ports/lodepng/portfile.cmake | 8 +------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/ports/lodepng/CMakeLists.txt b/ports/lodepng/CMakeLists.txt index 5f02c63775be97..1cf1865c067b02 100644 --- a/ports/lodepng/CMakeLists.txt +++ b/ports/lodepng/CMakeLists.txt @@ -6,10 +6,6 @@ target_include_directories(lodepng PUBLIC $ ) -# 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/") @@ -17,13 +13,6 @@ install(TARGETS lodepng EXPORT lodepng-targets) install(EXPORT lodepng-targets DESTINATION share/lodepng/) -# if(NOT DISABLE_INSTALL_TOOLS) -# install ( -# TARGETS pngdetail -# RUNTIME DESTINATION tools/lodepng -# ) -# endif() - if(NOT DDISABLE_INSTALL_EXAMPLES) install(DIRECTORY examples DESTINATION share/lodepng/) endif() diff --git a/ports/lodepng/portfile.cmake b/ports/lodepng/portfile.cmake index de63b8122ac78e..680c04d718f50d 100644 --- a/ports/lodepng/portfile.cmake +++ b/ports/lodepng/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -27,9 +26,4 @@ vcpkg_copy_pdbs() # Moves all .cmake files from /debug/share/lodepng/ to /share/lodepng/ vcpkg_fixup_cmake_targets() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/lodepng) - - -file(INSTALL ${SOURCE_PATH}/lodepng.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/lodepng RENAME copyright) - -vcpkg_test_cmake(PACKAGE_NAME lodepng) +file(INSTALL ${SOURCE_PATH}/lodepng.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From fe4430ce43bf255cbd89f16701852a7d5cdfb014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20S=2E=20Ga=C3=9Fmann?= Date: Wed, 18 Mar 2020 21:06:50 +0100 Subject: [PATCH 4/4] [lodepng] Remove osx failure from ci.baseline --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e87d8f23d5887a..cdb7e369ff9faa 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -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