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

18
build/cmake/samples/html.cmake
View File

@@ -10,7 +10,7 @@
set(wxSAMPLE_FOLDER html)
set(wxSAMPLE_SUBDIR html/)
wx_add_sample(about DATA data/about.htm data/logo.png LIBRARIES html)
wx_add_sample(about DATA data/about.htm data/logo.png LIBRARIES wxhtml)
wx_list_add_prefix(HELP_DATA_FILES helpfiles/
Index.hhk
another.hhc
@@ -23,21 +23,21 @@ wx_list_add_prefix(HELP_DATA_FILES helpfiles/
page2-b.htm
testing.hhp
)
wx_add_sample(help DATA ${HELP_DATA_FILES} LIBRARIES html NAME htmlhelp DEPENDS wxUSE_HELP)
wx_add_sample(helpview DATA test.zip LIBRARIES html DEPENDS wxUSE_HELP)
wx_add_sample(help DATA ${HELP_DATA_FILES} LIBRARIES wxhtml NAME htmlhelp DEPENDS wxUSE_HELP)
wx_add_sample(helpview DATA test.zip LIBRARIES wxhtml DEPENDS wxUSE_HELP)
#TODO: htmlctrl sample uses outdated definitions
#wx_add_sample(htmlctrl LIBRARIES html)
wx_add_sample(printing DATA logo6.gif test.htm LIBRARIES html NAME htmlprinting
#wx_add_sample(htmlctrl LIBRARIES wxhtml)
wx_add_sample(printing DATA logo6.gif test.htm LIBRARIES wxhtml NAME htmlprinting
DEPENDS wxUSE_PRINTING_ARCHITECTURE)
wx_add_sample(test
DATA
imagemap.png pic.png pic2.bmp i18n.gif
imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm
regres.htm foo.png subsup.html
LIBRARIES net html NAME htmltest)
wx_add_sample(virtual DATA start.htm LIBRARIES html)
wx_add_sample(widget DATA start.htm LIBRARIES html)
wx_add_sample(zip DATA pages.zip start.htm LIBRARIES html DEPENDS wxUSE_FS_ZIP)
LIBRARIES wxnet wxhtml NAME htmltest)
wx_add_sample(virtual DATA start.htm LIBRARIES wxhtml)
wx_add_sample(widget DATA start.htm LIBRARIES wxhtml)
wx_add_sample(zip DATA pages.zip start.htm LIBRARIES wxhtml DEPENDS wxUSE_FS_ZIP)
set(wxSAMPLE_SUBDIR)
set(wxSAMPLE_FOLDER)