From 9da0ca3cde16ca160dd07c5328a6b5c4d422f166 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 5 Feb 2025 21:26:19 +0100 Subject: [PATCH] cmake: normalize before matching paths with syspaths Requires CMake 3.20: https://cmake.org/cmake/help/latest/command/cmake_path.html Co-authored-by: Kai Pastor Ref: https://github.com/microsoft/vcpkg/pull/43463/commits/307e1f98786540b919536e1e6a301e2d6c60516e Closes #1538 --- src/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 37f2a9b7..fe595d3c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -223,6 +223,9 @@ foreach(_libdir IN LISTS CMAKE_SYSTEM_PREFIX_PATH) endforeach() foreach(_libdir IN LISTS LIBSSH2_LIBDIRS) + if(NOT CMAKE_VERSION VERSION_LESS 3.20) + cmake_path(SET _libdir NORMALIZE "${_libdir}") + endif() list(FIND _sys_libdirs "${_libdir}" _libdir_index) if(_libdir_index LESS 0) list(APPEND _ldflags "-L${_libdir}") @@ -257,6 +260,9 @@ foreach(_lib IN LISTS _implicit_libs LIBSSH2_LIBS) get_filename_component(_libdir ${_lib} DIRECTORY) get_filename_component(_libname ${_lib} NAME_WE) if(_libname MATCHES "^lib") + if(NOT CMAKE_VERSION VERSION_LESS 3.20) + cmake_path(SET _libdir NORMALIZE "${_libdir}") + endif() list(FIND _sys_libdirs "${_libdir}" _libdir_index) if(_libdir_index LESS 0) list(APPEND _ldflags "-L${_libdir}")