From 537564ae1944bfb8ae3ce605b3234f0dadeb09d5 Mon Sep 17 00:00:00 2001 From: NikitaFeodonit Date: Mon, 21 Jan 2019 18:19:39 +0300 Subject: [PATCH] CMake: use the target property OUTPUT_NAME instead of LOCATION in wx_get_dependencies --- build/cmake/config.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake index 39a4257d9d..90277f3955 100644 --- a/build/cmake/config.cmake +++ b/build/cmake/config.cmake @@ -33,12 +33,12 @@ macro(wx_get_dependencies var lib) get_target_property(deps ${lib} LINK_LIBRARIES) foreach(dep IN LISTS deps) if(TARGET ${dep}) - get_target_property(dep_path ${dep} LOCATION) + get_target_property(dep_name ${dep} OUTPUT_NAME) + set(dep_name "-l${dep_name}") else() - set(dep_path ${dep}) + get_filename_component(dep_name ${dep} NAME) endif() - get_filename_component(name ${dep_path} NAME) - wx_string_append(${var} "${name} ") + wx_string_append(${var} "${dep_name} ") endforeach() string(STRIP ${${var}} ${var}) endif()