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

Merge branch 'master' into web-request

Browse Source 
Merge with the latest master in preparation for merging into master.

Rebake to resolve conflicts in generated files.
This commit is contained in:
Vadim Zeitlin
2020-12-12 17:44:45 +01:00
parent 68cbd54db0 86a3578a11
commit 6bdab7b3c8
3934 changed files with 147571 additions and 96246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/cmake/tests/base/CMakeLists.txt
View File

@@ -122,9 +122,9 @@ wx_add_test(test_base ${TEST_SRC}
)
target_compile_definitions(test_base PRIVATE wxUSE_GUI=0 wxUSE_BASE=1)
if(wxUSE_SOCKETS)
wx_exe_link_libraries(test_base net)
wx_exe_link_libraries(test_base wxnet)
endif()
if(wxUSE_XML)
wx_exe_link_libraries(test_base xml)
wx_exe_link_libraries(test_base wxxml)
endif()
wx_test_enable_precomp(test_base)