Completely remove "adv" library from CMake build system

This build system is new and so doesn't need to keep "adv" for
compatibility.

build/cmake/demos/CMakeLists.txt

@@ -60,7 +60,7 @@ wx_add_demo(forty
     DATA
         about.htm
     LIBRARIES
-        html adv xml
+        html xml
     )
 wx_add_demo(fractal fractal.cpp)
 wx_add_demo(life

build/cmake/files.cmake

@@ -360,31 +360,6 @@ set(QT_SRC
     src/qt/taskbar.cpp
 )
 
-set(ADVANCED_QT_HDR
-    wx/generic/activityindicator.h
-    wx/generic/animate.h
-    wx/qt/calctrl.h
-    wx/qt/dataview.h
-    wx/qt/dvrenderer.h
-    wx/qt/dvrenderers.h
-    wx/qt/taskbar.h
-)
-
-set(ADVANCED_QT_SRC
-    src/generic/activityindicator.cpp
-    src/generic/animateg.cpp
-    src/qt/calctrl.cpp
-    src/qt/converter.cpp
-    src/qt/dataview.cpp
-    src/qt/dvrenderer.cpp
-    src/qt/dvrenderers.cpp
-    src/unix/joystick.cpp
-    src/unix/sound.cpp
-    src/qt/taskbar.cpp
-    src/common/taskbarcmn.cpp
-    src/qt/utils.cpp
-)
-
 set(MEDIA_QT_SRC
     src/qt/mediactrl.cpp
 )
@@ -2708,295 +2683,6 @@ set(UNIV_HDR
     wx/univ/window.h
 )
 
-set(ADVANCED_CMN_SRC
-    src/common/addremovectrl.cpp
-    src/common/animatecmn.cpp
-    src/common/bmpcboxcmn.cpp
-    src/common/calctrlcmn.cpp
-    src/common/datavcmn.cpp
-    src/common/gridcmn.cpp
-    src/common/hyperlnkcmn.cpp
-    src/common/notifmsgcmn.cpp
-    src/common/odcombocmn.cpp
-    src/common/richtooltipcmn.cpp
-    src/generic/aboutdlgg.cpp
-    src/generic/bannerwindow.cpp
-    src/generic/bmpcboxg.cpp
-    src/generic/calctrlg.cpp
-    src/generic/commandlinkbuttong.cpp
-    src/generic/datavgen.cpp
-    src/generic/datectlg.cpp
-    src/generic/editlbox.cpp
-    src/generic/grid.cpp
-    src/generic/gridctrl.cpp
-    src/generic/grideditors.cpp
-    src/generic/gridsel.cpp
-    src/generic/helpext.cpp
-    src/generic/hyperlinkg.cpp
-    src/generic/laywin.cpp
-    src/generic/notifmsgg.cpp
-    src/generic/odcombo.cpp
-    src/generic/propdlg.cpp
-    src/generic/richtooltipg.cpp
-    src/generic/sashwin.cpp
-    src/generic/splash.cpp
-    src/generic/timectrlg.cpp
-    src/generic/tipdlg.cpp
-    src/generic/treelist.cpp
-    src/generic/wizard.cpp
-)
-
-set(ADVANCED_CMN_HDR
-    wx/aboutdlg.h
-    wx/activityindicator.h
-    wx/addremovectrl.h
-    wx/animate.h
-    wx/bannerwindow.h
-    wx/bmpcbox.h
-    wx/calctrl.h
-    wx/commandlinkbutton.h
-    wx/dataview.h
-    wx/datectrl.h
-    wx/dateevt.h
-    wx/datetimectrl.h
-    wx/dcbuffer.h
-    wx/dvrenderers.h
-    wx/editlbox.h
-    wx/generic/aboutdlgg.h
-    wx/generic/bmpcbox.h
-    wx/generic/calctrlg.h
-    wx/generic/datectrl.h
-    wx/generic/dataview.h
-    wx/generic/dvrenderer.h
-    wx/generic/dvrenderers.h
-    wx/generic/grid.h
-    wx/generic/gridctrl.h
-    wx/generic/grideditors.h
-    wx/generic/gridsel.h
-    wx/generic/helpext.h
-    wx/generic/hyperlink.h
-    wx/generic/laywin.h
-    wx/generic/notifmsg.h
-    wx/generic/propdlg.h
-    wx/generic/sashwin.h
-    wx/generic/splash.h
-    wx/generic/timectrl.h
-    wx/generic/wizard.h
-    wx/grid.h
-    wx/hyperlink.h
-    wx/joystick.h
-    wx/laywin.h
-    wx/notifmsg.h
-    wx/odcombo.h
-    wx/propdlg.h
-    wx/richtooltip.h
-    wx/sashwin.h
-    wx/sound.h
-    wx/splash.h
-    wx/taskbar.h
-    wx/timectrl.h
-    wx/tipdlg.h
-    wx/treelist.h
-    wx/wizard.h
-)
-
-set(ADVANCED_MSW_SRC
-    src/generic/activityindicator.cpp
-    src/common/taskbarcmn.cpp
-    src/msw/aboutdlg.cpp
-    src/msw/notifmsg.cpp
-    src/msw/rt/notifmsgrt.cpp
-    src/msw/richtooltip.cpp
-    src/msw/sound.cpp
-    src/msw/taskbar.cpp
-)
-
-set(ADVANCED_MSW_HDR
-    wx/generic/activityindicator.h
-    wx/msw/sound.h
-    wx/msw/taskbar.h
-)
-
-set(ADVANCED_MSW_NATIVE_SRC
-    src/generic/animateg.cpp
-    src/msw/bmpcbox.cpp
-    src/msw/calctrl.cpp
-    src/msw/commandlinkbutton.cpp
-    src/msw/datecontrols.cpp
-    src/msw/datectrl.cpp
-    src/msw/datetimectrl.cpp
-    src/msw/hyperlink.cpp
-    src/msw/timectrl.cpp
-)
-
-set(ADVANCED_MSW_NATIVE_HDR
-    wx/generic/animate.h
-    wx/msw/bmpcbox.h
-    wx/msw/commandlinkbutton.h
-    wx/msw/calctrl.h
-    wx/msw/datectrl.h
-    wx/msw/datetimectrl.h
-    wx/msw/hyperlink.h
-    wx/msw/timectrl.h
-)
-
-set(ADVANCED_MSW_DESKTOP_SRC
-    src/msw/joystick.cpp
-)
-
-set(ADVANCED_MSW_DESKTOP_HDR
-    wx/msw/joystick.h
-)
-
-set(ADVANCED_OSX_COCOA_SRC
-    src/common/taskbarcmn.cpp
-    src/generic/animateg.cpp
-    src/osx/cocoa/activityindicator.mm
-    src/osx/datetimectrl_osx.cpp
-    src/osx/datectrl_osx.cpp
-    src/osx/sound_osx.cpp
-    src/osx/timectrl_osx.cpp
-    src/osx/carbon/sound.cpp
-    src/osx/core/sound.cpp
-    src/osx/cocoa/aboutdlg.mm
-    src/osx/dataview_osx.cpp
-    src/osx/cocoa/dataview.mm
-    src/osx/cocoa/datetimectrl.mm
-    src/osx/cocoa/notifmsg.mm
-    src/osx/cocoa/taskbar.mm
-    src/osx/core/hidjoystick.cpp
-)
-
-set(ADVANCED_OSX_COCOA_HDR
-    wx/generic/animate.h
-    wx/osx/activityindicator.h
-    wx/osx/dataview.h
-    wx/osx/datectrl.h
-    wx/osx/datetimectrl.h
-    wx/osx/dvrenderer.h
-    wx/osx/dvrenderers.h
-    wx/osx/joystick.h
-    wx/osx/sound.h
-    wx/osx/taskbarosx.h
-    wx/osx/timectrl.h
-    wx/osx/core/joystick.h
-    wx/osx/cocoa/dataview.h
-)
-
-set(ADVANCED_OSX_IPHONE_SRC
-    src/generic/animateg.cpp
-    src/osx/sound_osx.cpp
-    src/osx/core/sound.cpp
-)
-
-set(ADVANCED_OSX_IPHONE_HDR
-    wx/generic/animate.h
-    wx/osx/sound.h
-)
-
-set(ADVANCED_COCOA_SRC
-    src/cocoa/taskbar.mm
-    src/common/taskbarcmn.cpp
-    src/generic/animateg.cpp
-    src/osx/core/hidjoystick.cpp
-)
-
-set(ADVANCED_COCOA_HDR
-    wx/cocoa/taskbar.h
-    wx/generic/animate.h
-    wx/osx/core/joystick.h
-)
-
-set(ADVANCED_UNIX_SRC
-    src/common/taskbarcmn.cpp
-    src/unix/joystick.cpp
-    src/unix/sound.cpp
-    src/unix/taskbarx11.cpp
-)
-
-set(ADVANCED_UNIX_HDR
-    wx/unix/joystick.h
-    wx/unix/sound.h
-    wx/unix/taskbarx11.h
-)
-
-set(ADVANCED_MOTIF_SRC
-    src/generic/activityindicator.cpp
-    src/generic/animateg.cpp
-)
-
-set(ADVANCED_MOTIF_HDR
-    wx/generic/animateanimate.h
-    wx/generic/animate.h
-)
-
-set(ADVANCED_GTK_WIN32_SRC
-    src/common/taskbarcmn.cpp
-    src/msw/joystick.cpp
-    src/msw/sound.cpp
-)
-
-set(ADVANCED_GTK_WIN32_HDR
-    wx/msw/joystick.h
-    wx/msw/sound.h
-    wx/msw/taskbar.h
-)
-
-set(ADVANCED_GTK_SRC
-    ${ADVANCED_GTK_PLATFORM_SRC}
-    src/gtk/notifmsg.cpp
-    src/gtk/taskbar.cpp
-)
-
-set(ADVANCED_GTK2_SRC
-    ${ADVANCED_GTK_SRC}
-    src/generic/activityindicator.cpp
-    src/gtk/eggtrayicon.c
-)
-
-set(ADVANCED_GTK_HDR
-    ${ADVANCED_GTK_PLATFORM_HDR}
-    wx/generic/activityindicator.h
-    wx/gtk/taskbar.h
-)
-
-set(ADVANCED_GTK2_HDR
-    ${ADVANCED_GTK_HDR}
-)
-
-set(ADVANCED_GTK_NATIVE_SRC
-    src/gtk/aboutdlg.cpp
-    src/gtk/activityindicator.cpp
-    src/gtk/animate.cpp
-    src/gtk/bmpcbox.cpp
-    src/gtk/calctrl.cpp
-    src/gtk/dataview.cpp
-    src/gtk/hyperlink.cpp
-)
-
-set(ADVANCED_GTK_NATIVE_HDR
-    wx/gtk/activityindicator.h
-    wx/gtk/animate.h
-    wx/gtk/bmpcbox.h
-    wx/gtk/calctrl.h
-    wx/gtk/dataview.h
-    wx/gtk/dvrenderer.h
-    wx/gtk/dvrenderers.h
-    wx/gtk/hyperlink.h
-)
-
-set(ADVANCED_GTK1_SRC
-    src/generic/activityindicator.cpp
-    src/generic/animateg.cpp
-    src/gtk1/eggtrayicon.c
-    src/gtk1/taskbar.cpp
-)
-
-set(ADVANCED_GTK1_HDR
-    wx/generic/activityindicator.h
-    wx/generic/animate.h
-)
-
 set(MEDIA_CMN_SRC
     src/common/mediactrlcmn.cpp
 )

build/cmake/lib/CMakeLists.txt

@@ -43,7 +43,7 @@ add_opt_lib(net wxUSE_SOCKETS)
 
 # Define UI libraries
 if(wxUSE_GUI)
-    list(APPEND LIBS core adv)
+    list(APPEND LIBS core)
     foreach(lib
         aui
         html

build/cmake/lib/adv/CMakeLists.txt

@@ -1,48 +0,0 @@
-#############################################################################
-# Name:        build/cmake/lib/adv/CMakeLists.txt
-# Purpose:     CMake file for adv library
-# Author:      Tobias Taschner
-# Created:     2016-10-03
-# Copyright:   (c) 2016 wxWidgets development team
-# Licence:     wxWindows licence
-#############################################################################
-
-include(../../source_groups.cmake)
-
-wx_append_sources(ADV_FILES ADVANCED_CMN)
-
-if(WXMSW)
-    wx_append_sources(ADV_FILES ADVANCED_MSW)
-    wx_append_sources(ADV_FILES ADVANCED_MSW_NATIVE)
-    wx_append_sources(ADV_FILES ADVANCED_MSW_DESKTOP)
-elseif(WXOSX_COCOA)
-    wx_append_sources(ADV_FILES ADVANCED_OSX_COCOA)
-elseif(WXGTK)
-    if(WXGTK2)
-        wx_append_sources(ADV_FILES ADVANCED_GTK2)
-    else()
-        wx_append_sources(ADV_FILES ADVANCED_GTK)
-    endif()
-    wx_append_sources(ADV_FILES ADVANCED_GTK_NATIVE)
-    if(WIN32)
-        wx_append_sources(ADV_FILES ADVANCED_GTK_WIN32)
-    endif()
-endif()
-
-if(UNIX AND NOT APPLE AND NOT WIN32)
-    wx_append_sources(ADV_FILES ADVANCED_UNIX)
-endif()
-
-wx_add_library(adv ${ADV_FILES})
-if(WIN32)
-    wx_lib_link_libraries(adv PRIVATE
-        winmm
-    )
-endif()
-if(WXOSX_COCOA)
-    wx_lib_link_libraries(adv PUBLIC
-        "-framework AudioToolbox"
-        )
-endif()
-
-wx_finalize_lib(adv)

build/cmake/lib/core/CMakeLists.txt

@@ -56,4 +56,15 @@ foreach(lib JPEG PNG TIFF)
     endif()
 endforeach()
 
+if(WIN32)
+    wx_lib_link_libraries(core PRIVATE
+        winmm
+    )
+endif()
+if(WXOSX_COCOA)
+    wx_lib_link_libraries(core PUBLIC
+        "-framework AudioToolbox"
+        )
+endif()
+
 wx_finalize_lib(core)

build/cmake/lib/propgrid/CMakeLists.txt

@@ -12,6 +12,5 @@ include(../../source_groups.cmake)
 wx_append_sources(PROPGRID_FILES PROPGRID)
 
 wx_add_library(propgrid ${PROPGRID_FILES})
-wx_lib_link_libraries(propgrid PRIVATE adv)
 
 wx_finalize_lib(propgrid)

build/cmake/lib/richtext/CMakeLists.txt

@@ -12,6 +12,6 @@ include(../../source_groups.cmake)
 wx_append_sources(RICHTEXT_FILES RICHTEXT)
 
 wx_add_library(richtext ${RICHTEXT_FILES})
-wx_lib_link_libraries(richtext PRIVATE adv html xml)
+wx_lib_link_libraries(richtext PRIVATE html xml)
 
 wx_finalize_lib(richtext)

build/cmake/lib/xrc/CMakeLists.txt

@@ -12,6 +12,6 @@ include(../../source_groups.cmake)
 wx_append_sources(XRC_FILES XRC)
 
 wx_add_library(xrc ${XRC_FILES})
-wx_lib_link_libraries(xrc PRIVATE adv html xml)
+wx_lib_link_libraries(xrc PRIVATE html xml)
 
 wx_finalize_lib(xrc)

build/cmake/samples/CMakeLists.txt

@@ -8,22 +8,22 @@
 #############################################################################
 
 wx_add_sample(access accesstest.cpp DEPENDS wxUSE_ACCESSIBILITY)
-wx_add_sample(animate anitest.cpp anitest.h LIBRARIES adv DATA throbber.gif hourglass.ani DEPENDS wxUSE_ANIMATIONCTRL)
+wx_add_sample(animate anitest.cpp anitest.h DATA throbber.gif hourglass.ani DEPENDS wxUSE_ANIMATIONCTRL)
 wx_add_sample(archive CONSOLE)
 wx_add_sample(artprov arttest.cpp artbrows.cpp artbrows.h)
-wx_add_sample(aui auidemo.cpp LIBRARIES adv aui html NAME auidemo DEPENDS wxUSE_AUI)
+wx_add_sample(aui auidemo.cpp LIBRARIES aui html NAME auidemo DEPENDS wxUSE_AUI)
-wx_add_sample(calendar RES calendar.rc LIBRARIES adv DEPENDS wxUSE_CALENDARCTRL)
+wx_add_sample(calendar RES calendar.rc DEPENDS wxUSE_CALENDARCTRL)
 wx_add_sample(caret DEPENDS wxUSE_CARET)
 wx_add_sample(clipboard DEPENDS wxUSE_CLIPBOARD)
-wx_add_sample(collpane LIBRARIES adv DEPENDS wxUSE_COLLPANE)
+wx_add_sample(collpane DEPENDS wxUSE_COLLPANE)
-wx_add_sample(combo LIBRARIES adv DATA dropbuth.png dropbutn.png dropbutp.png DEPENDS wxUSE_COMBOCTRL)
+wx_add_sample(combo DATA dropbuth.png dropbutn.png dropbutp.png DEPENDS wxUSE_COMBOCTRL)
 wx_add_sample(config conftest.cpp DEPENDS wxUSE_CONFIG)
 wx_add_sample(console CONSOLE IMPORTANT)
-wx_add_sample(dataview IMPORTANT dataview.cpp mymodels.cpp mymodels.h LIBRARIES adv DEPENDS wxUSE_DATAVIEWCTRL)
+wx_add_sample(dataview IMPORTANT dataview.cpp mymodels.cpp mymodels.h DEPENDS wxUSE_DATAVIEWCTRL)
 if(wxUSE_ON_FATAL_EXCEPTION AND (NOT WIN32 OR MSVC))
     wx_add_sample(debugrpt LIBRARIES qa DEPENDS wxUSE_DEBUGREPORT)
 endif()
-wx_add_sample(dialogs dialogs.cpp dialogs.h LIBRARIES adv DATA tips.txt)
+wx_add_sample(dialogs dialogs.cpp dialogs.h DATA tips.txt)
 wx_add_sample(dialup nettest.cpp LIBRARIES net DEPENDS wxUSE_DIALUP_MANAGER)
 wx_add_sample(display DEPENDS wxUSE_DISPLAY)
 wx_add_sample(dnd dnd.cpp RES dnd.rc DATA wxwin.png DEPENDS wxUSE_DRAG_AND_DROP)
@@ -39,13 +39,13 @@ wx_add_sample(except DEPENDS wxUSE_EXCEPTIONS)
 wx_add_sample(exec)
 wx_add_sample(font DATA wxprivate.ttf)
 wx_add_sample(fswatcher DEPENDS wxUSE_FSWATCHER)
-wx_add_sample(grid griddemo.cpp griddemo.h LIBRARIES adv DEPENDS wxUSE_GRID)
+wx_add_sample(grid griddemo.cpp griddemo.h DEPENDS wxUSE_GRID)
 
 wx_list_add_prefix(HELP_DOC_FILES doc/
     aindex.html down.gif dxxgifs.tex HIER.html icon1.gif icon2.gif index.html
     logo.gif wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm
     )
-wx_add_sample(help demo.cpp LIBRARIES html adv
+wx_add_sample(help demo.cpp LIBRARIES html
     DATA
     back.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc
     doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif
@@ -73,7 +73,7 @@ wx_add_sample(ipc server.cpp server.h connection.h ipcsetup.h NAME ipcserver LIB
 wx_add_sample(ipc CONSOLE baseclient.cpp connection.h ipcsetup.h NAME baseipcclient LIBRARIES net DEPENDS wxUSE_IPC)
 wx_add_sample(ipc CONSOLE baseserver.cpp connection.h ipcsetup.h NAME baseipcserver LIBRARIES net DEPENDS wxUSE_IPC)
 set(wxSAMPLE_FOLDER)
-wx_add_sample(joytest joytest.cpp joytest.h DATA buttonpress.wav LIBRARIES adv DEPENDS wxUSE_JOYSTICK)
+wx_add_sample(joytest joytest.cpp joytest.h DATA buttonpress.wav DEPENDS wxUSE_JOYSTICK)
 wx_add_sample(keyboard)
 wx_add_sample(layout layout.cpp layout.h)
 wx_add_sample(listctrl listtest.cpp listtest.h RES listtest.rc DEPENDS wxUSE_LISTCTRL)
@@ -82,7 +82,7 @@ wx_add_sample(mediaplayer LIBRARIES media DEPENDS wxUSE_MEDIACTRL)
 wx_add_sample(memcheck)
 wx_add_sample(menu DEPENDS wxUSE_MENUS)
 wx_add_sample(minimal IMPORTANT)
-wx_add_sample(notebook notebook.cpp notebook.h LIBRARIES aui adv DEPENDS wxUSE_NOTEBOOK)
+wx_add_sample(notebook notebook.cpp notebook.h LIBRARIES aui DEPENDS wxUSE_NOTEBOOK)
 if(wxUSE_OPENGL)
     set(wxSAMPLE_SUBDIR opengl/)
     set(wxSAMPLE_FOLDER OpenGL)
@@ -106,12 +106,12 @@ wx_add_sample(power)
 wx_add_sample(preferences DEPENDS wxUSE_PREFERENCES_EDITOR)
 wx_add_sample(printing printing.cpp printing.h DEPENDS wxUSE_PRINTING_ARCHITECTURE)
 wx_add_sample(propgrid propgrid.cpp propgrid_minimal.cpp sampleprops.cpp
-    tests.cpp sampleprops.h propgrid.h LIBRARIES adv propgrid NAME propgriddemo DEPENDS wxUSE_PROPGRID)
+    tests.cpp sampleprops.h propgrid.h LIBRARIES propgrid NAME propgriddemo DEPENDS wxUSE_PROPGRID)
 wx_add_sample(render FOLDER render)
 wx_add_sample(render DLL renddll.cpp NAME renddll FOLDER render)
-wx_add_sample(ribbon ribbondemo.cpp LIBRARIES ribbon adv NAME ribbondemo DEPENDS wxUSE_RIBBON)
+wx_add_sample(ribbon ribbondemo.cpp LIBRARIES ribbon NAME ribbondemo DEPENDS wxUSE_RIBBON)
-wx_add_sample(richtext LIBRARIES richtext adv html xml NAME richtextdemo DEPENDS wxUSE_XML wxUSE_RICHTEXT)
+wx_add_sample(richtext LIBRARIES richtext html xml NAME richtextdemo DEPENDS wxUSE_XML wxUSE_RICHTEXT)
-wx_add_sample(sashtest sashtest.cpp sashtest.h RES sashtest.rc LIBRARIES adv DEPENDS wxUSE_SASH)
+wx_add_sample(sashtest sashtest.cpp sashtest.h RES sashtest.rc DEPENDS wxUSE_SASH)
 wx_add_sample(scroll)
 wx_add_sample(secretstore CONSOLE DEPENDS wxUSE_SECRETSTORE)
 wx_add_sample(shaped DATA star.png)
@@ -121,8 +121,8 @@ if(wxUSE_SOCKETS)
     wx_add_sample(sockets CONSOLE baseclient.cpp NAME baseclient LIBRARIES net FOLDER sockets)
     wx_add_sample(sockets CONSOLE baseserver.cpp NAME baseserver LIBRARIES net FOLDER sockets)
 endif()
-wx_add_sample(sound RES sound.rc DATA 9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav LIBRARIES adv DEPENDS wxUSE_SOUND)
+wx_add_sample(sound RES sound.rc DATA 9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav DEPENDS wxUSE_SOUND)
-wx_add_sample(splash DATA splash.png press.mpg LIBRARIES adv DEPENDS wxUSE_SPLASH)
+wx_add_sample(splash DATA splash.png press.mpg DEPENDS wxUSE_SPLASH)
 if(TARGET splash AND wxUSE_MEDIACTRL)
     wx_exe_link_libraries(splash media)
 endif()
@@ -132,17 +132,17 @@ wx_add_sample(stc stctest.cpp edit.cpp prefs.cpp edit.h defsext.h prefs.h
     DATA stctest.cpp NAME stctest LIBRARIES stc DEPENDS wxUSE_STC)
 wx_add_sample(svg svgtest.cpp RES svgtest.rc DEPENDS wxUSE_SVG)
 wx_add_sample(taborder)
-wx_add_sample(taskbar tbtest.cpp tbtest.h LIBRARIES adv DEPENDS wxUSE_TASKBARICON)
+wx_add_sample(taskbar tbtest.cpp tbtest.h DEPENDS wxUSE_TASKBARICON)
 wx_add_sample(text DEPENDS wxUSE_TEXTCTRL)
 wx_add_sample(thread DEPENDS wxUSE_THREADS)
 wx_add_sample(toolbar RES toolbar.rc DEPENDS wxUSE_TOOLBAR)
 wx_add_sample(treectrl treetest.cpp treetest.h DEPENDS wxUSE_TREECTRL)
-wx_add_sample(treelist LIBRARIES adv DEPENDS wxUSE_TREELISTCTRL)
+wx_add_sample(treelist DEPENDS wxUSE_TREELISTCTRL)
 wx_add_sample(typetest typetest.cpp typetest.h)
 wx_add_sample(uiaction DEPENDS wxUSE_UIACTIONSIMULATOR)
 wx_add_sample(validate validate.cpp validate.h DEPENDS wxUSE_VALIDATORS)
 wx_add_sample(vscroll vstest.cpp)
-wx_add_sample(webview LIBRARIES webview stc adv NAME webviewsample DEPENDS wxUSE_WEBVIEW)
+wx_add_sample(webview LIBRARIES webview stc NAME webviewsample DEPENDS wxUSE_WEBVIEW)
 # widgets Sample
 set(SAMPLE_WIDGETS_SRC
     activityindicator.cpp
@@ -201,9 +201,8 @@ wx_list_add_prefix(WIDGETS_RC_FILES icons/
     )
 wx_add_sample(widgets IMPORTANT ${SAMPLE_WIDGETS_SRC}
     DATA ${WIDGETS_RC_FILES} textctrl.cpp
-    LIBRARIES adv
     )
-wx_add_sample(wizard LIBRARIES adv DEPENDS wxUSE_WIZARDDLG)
+wx_add_sample(wizard DEPENDS wxUSE_WIZARDDLG)
 wx_add_sample(wrapsizer)
 
 wx_list_add_prefix(XRC_RC_FILES rc/
@@ -232,7 +231,7 @@ wx_add_sample(xrc
     custclas.h
     objrefdlg.h
     DATA ${XRC_RC_FILES}
-    LIBRARIES aui ribbon xrc html adv
+    LIBRARIES aui ribbon xrc html
     NAME xrcdemo
     DEPENDS wxUSE_XML wxUSE_XRC
     )
@@ -263,5 +262,5 @@ if(WIN32)
     wx_add_sample(nativdlg nativdlg.cpp nativdlg.h resource.h RES nativdlg.rc)
     wx_add_sample(oleauto DEPENDS wxUSE_OLE)
     wx_add_sample(regtest RES regtest.rc DEPENDS wxUSE_REGKEY)
-    wx_add_sample(taskbarbutton LIBRARIES adv DEPENDS wxUSE_TASKBARBUTTON)
+    wx_add_sample(taskbarbutton DEPENDS wxUSE_TASKBARBUTTON)
 endif()

build/cmake/tests/gui/CMakeLists.txt

@@ -180,7 +180,6 @@ endif()
 if(wxUSE_XML)
     wx_exe_link_libraries(test_gui xml)
 endif()
-wx_exe_link_libraries(test_gui adv)
 if(wxUSE_HTML)
     wx_exe_link_libraries(test_gui html)
 endif()