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

CMake: use wx prefix in library names

Browse Source 
Rename all library targets to start with wx. This way it does not use generic
names like base or core that could interfere with other libraries that add
include the wxWidgets project.
This commit is contained in:
Maarten Bent
2020-05-17 19:41:44 +02:00
parent 0c2d05f52f
commit 0f806ad96d
26 changed files with 198 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,9 +121,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)

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

@@ -41,9 +41,9 @@ wx_add_test(test_drawing ${TEST_DRAWING_SRC}
DATA ${TEST_DRAWING_DATA}
)
if(wxUSE_SOCKETS)
wx_exe_link_libraries(test_drawing net)
wx_exe_link_libraries(test_drawing wxnet)
endif()
wx_exe_link_libraries(test_drawing core)
wx_exe_link_libraries(test_drawing wxcore)
wx_test_enable_precomp(test_drawing)
# This is a sample plugin, it simply uses a wxImage based

18
build/cmake/tests/gui/CMakeLists.txt
View File

@@ -168,29 +168,29 @@ wx_add_test(test_gui ${TEST_GUI_SRC}
DATA ${TEST_GUI_DATA}
RES ../samples/sample.rc
)
wx_exe_link_libraries(test_gui core)
wx_exe_link_libraries(test_gui wxcore)
if(wxUSE_RICHTEXT)
wx_exe_link_libraries(test_gui richtext)
wx_exe_link_libraries(test_gui wxrichtext)
endif()
if(wxUSE_STC)
wx_exe_link_libraries(test_gui stc)
wx_exe_link_libraries(test_gui wxstc)
endif()
if(wxUSE_MEDIACTRL)
wx_exe_link_libraries(test_gui media)
wx_exe_link_libraries(test_gui wxmedia)
endif()
if(wxUSE_XRC)
wx_exe_link_libraries(test_gui xrc)
wx_exe_link_libraries(test_gui wxxrc)
endif()
if(wxUSE_XML)
wx_exe_link_libraries(test_gui xml)
wx_exe_link_libraries(test_gui wxxml)
endif()
if(wxUSE_HTML)
wx_exe_link_libraries(test_gui html)
wx_exe_link_libraries(test_gui wxhtml)
endif()
if(wxUSE_SOCKETS)
wx_exe_link_libraries(test_gui net)
wx_exe_link_libraries(test_gui wxnet)
endif()
if(wxUSE_WEBVIEW)
wx_exe_link_libraries(test_gui webview)
wx_exe_link_libraries(test_gui wxwebview)
endif()
wx_test_enable_precomp(test_gui)