Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: fix wx-config --libs output for generators and abs paths

Browse Source 
Don't prepend "-l" if a dependency is not a library name.

Closes https://github.com/wxWidgets/wxWidgets/pull/2402
This commit is contained in:
JackBoosY
2021-06-23 01:14:01 -07:00
committed by Vadim Zeitlin
parent 3c65bdedf1
commit c284c88db1
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build/cmake/config.cmake
View File

@@ -40,16 +40,26 @@ macro(wx_get_dependencies var lib)
get_target_property(dep_name ${dep} OUTPUT_NAME) get_target_property(dep_name ${dep} OUTPUT_NAME)
endif() endif()
else() else()
get_filename_component(dep_name ${dep} NAME) # For the value like $<$<CONFIG:DEBUG>:LIB_PATH>
# Or $<$<NOT:$<CONFIG:DEBUG>>:LIB_PATH>
string(REGEX REPLACE "^.+>:(.+)>$" "\\1" dep_name ${dep})
if (NOT dep_name)
set(dep_name ${dep})
endif()
endif() endif()
if(dep_name STREQUAL "libc.so") if(dep_name STREQUAL "libc.so")
# don't include this library # don't include this library
elseif(dep_name MATCHES "^-(.*)") # -l, -framework, -weak_framework elseif(dep_name MATCHES "^-(.*)$") # -l, -framework, -weak_framework
wx_string_append(${var} "${dep_name} ") wx_string_append(${var} "${dep_name} ")
elseif(dep_name MATCHES "^lib(.*)(.so|.dylib|.tbd|.a)") elseif(dep_name MATCHES "^lib(.*)(.so|.dylib|.tbd|.a)$")
wx_string_append(${var} "-l${CMAKE_MATCH_1} ") wx_string_append(${var} "-l${CMAKE_MATCH_1} ")
elseif(dep_name) elseif(dep_name)
wx_string_append(${var} "-l${dep_name} ") get_filename_component(abs_path ${dep_name} PATH)
if (abs_path) # value contains path
wx_string_append(${var} "${dep_name} ")
else()
wx_string_append(${var} "-l${dep_name} ")
endif()
endif() endif()
endforeach() endforeach()
string(STRIP ${${var}} ${var}) string(STRIP ${${var}} ${var})