From: Viktor Szakats <commit@vsz.me>
Date: Wed, 5 Feb 2025 17:32:18 +0000 (+0100)
Subject: cmake: normalize before matching paths with syspaths
X-Git-Tag: curl-8_12_1~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d07853195d75f2066cba5e4a9cbba1d6982658a0;p=thirdparty%2Fcurl.git

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 #16191
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 244384fb9a..afd2ff7d90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2260,6 +2260,9 @@ if(NOT CURL_DISABLE_INSTALL)
   endforeach()
 
   foreach(_libdir IN LISTS _custom_libdirs CURL_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}")
@@ -2294,6 +2297,9 @@ if(NOT CURL_DISABLE_INSTALL)
       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}")