Skip to content

[libpng] Fix find_package debug libraries #25200

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
ras0219-msft merged 3 commits into from
Jun 13, 2022
Merged

[libpng] Fix find_package debug libraries #25200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
553dbfb
[cmake-user] Extend check for release vs. debug libs
dg0yt Jun 12, 2022
670c729
Add wrapper for PNG
dg0yt Jun 12, 2022
1b874ff
Update versions
dg0yt Jun 12, 2022
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
1 change: 1 addition & 0 deletions ports/libpng/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ vcpkg_cmake_configure(
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/libpng)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/png")

vcpkg_fixup_pkgconfig()
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
Expand Down
3 changes: 3 additions & 0 deletions ports/libpng/vcpkg-cmake-wrapper.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
find_library(PNG_LIBRARY_RELEASE NAMES png16 libpng16 NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
find_library(PNG_LIBRARY_DEBUG NAMES png16d libpng16d NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
_find_package(${ARGS})
2 changes: 1 addition & 1 deletion ports/libpng/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libpng",
"version": "1.6.37",
"port-version": 17,
"port-version": 18,
"description": "libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files",
"homepage": "https://github.com/glennrp/libpng",
"license": "libpng-2.0",
Expand Down
32 changes: 21 additions & 11 deletions scripts/test_ports/cmake-user/project/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,22 +78,32 @@ foreach(package ${FIND_PACKAGES})
endif()
target_link_libraries(exe PRIVATE ${libraries})

if(CMAKE_BUILD_TYPE STREQUAL "Release")
string(REPLACE "debug;" "ignore:" libraries "${libraries}")
elseif(CMAKE_BUILD_TYPE STREQUAL "Debug")
string(REPLACE "optimized;" "ignore:" libraries "${libraries}")
endif()
set(last_keyword "")
foreach(item IN LISTS libraries)
string(FIND "${item}" "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/" starts_with_vcpkg)
if(NOT starts_with_vcpkg EQUAL "0")
if(item STREQUAL "optimized" OR item STREQUAL "debug")
set(last_keyword "${item}")
continue()
endif()
string(FIND "${item}" "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/" starts_with_release)
string(FIND "${item}" "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/" starts_with_debug)
if(CMAKE_BUILD_TYPE STREQUAL "Release" AND starts_with_debug EQUAL "0")
message(SEND_ERROR "Debug lib in release build: ${item}")
elseif(CMAKE_BUILD_TYPE STREQUAL "Debug" AND starts_with_release EQUAL "0")
message(SEND_ERROR "Release lib in debug build: ${item}")
if(starts_with_release EQUAL "0")
if(last_keyword STREQUAL "optimized")
# okay
elseif(last_keyword STREQUAL "debug")
message(SEND_ERROR "Release lib for 'debug' keyword: ${item}")
elseif(CMAKE_BUILD_TYPE STREQUAL "Debug")
message(SEND_ERROR "Release lib for 'Debug' build: ${item}")
endif()
elseif(starts_with_debug EQUAL "0")
if(last_keyword STREQUAL "debug")
# okay
elseif(last_keyword STREQUAL "optimized")
message(SEND_ERROR "Debug lib for 'optimized' keyword: ${item}")
elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
message(SEND_ERROR "Debug lib for 'Release' build: ${item}")
endif()
endif()
set(last_keyword "")
continue()
endforeach()
endforeach()
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3926,7 +3926,7 @@
},
"libpng": {
"baseline": "1.6.37",
"port-version": 17
"port-version": 18
},
"libpopt": {
"baseline": "1.16",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libpng.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5e3ec787e7c6f09dd162648b700aeb712af0ffd2",
"version": "1.6.37",
"port-version": 18
},
{
"git-tree": "ffe71783883ccf1c6e6a306daa686868bfb62191",
"version": "1.6.37",
Expand Down