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

Remove dependency on GTK from wxbase in CMake build

Browse Source 
libwx_baseu_3.1.so should not include "-lgtk-3" during link.

See https://github.com/wxWidgets/wxWidgets/pull/2434

Closes #19224.
This commit is contained in:
jolz
2021-07-13 15:38:38 +02:00
committed by Vadim Zeitlin
parent 912f4b76ac
commit 5a514afd34
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/cmake/functions.cmake
View File

@@ -296,7 +296,7 @@ function(wx_set_target_properties target_name is_base)
${wxSOURCE_DIR}/include ${wxSOURCE_DIR}/include
) )
if(wxTOOLKIT_INCLUDE_DIRS) if(wxTOOLKIT_INCLUDE_DIRS AND NOT is_base)
target_include_directories(${target_name} target_include_directories(${target_name}
PUBLIC ${wxTOOLKIT_INCLUDE_DIRS}) PUBLIC ${wxTOOLKIT_INCLUDE_DIRS})
endif() endif()
@@ -327,7 +327,7 @@ function(wx_set_target_properties target_name is_base)
PUBLIC ${WIN32_LIBRARIES}) PUBLIC ${WIN32_LIBRARIES})
endif() endif()
if(wxTOOLKIT_LIBRARIES) if(wxTOOLKIT_LIBRARIES AND NOT is_base)
target_link_libraries(${target_name} target_link_libraries(${target_name}
PUBLIC ${wxTOOLKIT_LIBRARIES}) PUBLIC ${wxTOOLKIT_LIBRARIES})
endif() endif()