luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: normalize before matching paths with syspaths

Browse Source 
Requires CMake 3.20:
https://cmake.org/cmake/help/latest/command/cmake_path.html

Co-authored-by: Kai Pastor
Ref: 307e1f9878
Closes #16191
This commit is contained in:
Viktor Szakats 2025-02-05 18:32:18 +01:00
parent b3d0c37ff4
commit d07853195d
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -2260,6 +2260,9 @@ if(NOT CURL_DISABLE_INSTALL)
endforeach() endforeach()
foreach(_libdir IN LISTS _custom_libdirs CURL_LIBDIRS) 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) list(FIND _sys_libdirs "${_libdir}" _libdir_index)
if(_libdir_index LESS 0) if(_libdir_index LESS 0)
list(APPEND _ldflags "-L${_libdir}") list(APPEND _ldflags "-L${_libdir}")
@ -2294,6 +2297,9 @@ if(NOT CURL_DISABLE_INSTALL)
get_filename_component(_libdir ${_lib} DIRECTORY) get_filename_component(_libdir ${_lib} DIRECTORY)
get_filename_component(_libname ${_lib} NAME_WE) get_filename_component(_libname ${_lib} NAME_WE)
if(_libname MATCHES "^lib") 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) list(FIND _sys_libdirs "${_libdir}" _libdir_index)
if(_libdir_index LESS 0) if(_libdir_index LESS 0)
list(APPEND _ldflags "-L${_libdir}") list(APPEND _ldflags "-L${_libdir}")