]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
cmake: normalize before matching paths with syspaths
authorViktor Szakats <commit@vsz.me>
Wed, 5 Feb 2025 17:32:18 +0000 (18:32 +0100)
committerViktor Szakats <commit@vsz.me>
Thu, 6 Feb 2025 22:12:18 +0000 (23:12 +0100)
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

CMakeLists.txt

index 244384fb9ab242e50d1ead0d0608cc661150ec00..afd2ff7d9088dc991fe8fe528d7d5bc56846f45c 100644 (file)
@@ -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}")