From ff24484952f78320855a7674b1e2b145e38b2f9b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 29 Jun 2020 22:23:10 +0200 Subject: [PATCH] Add wxUSE_MENUBAR to CMake too For now there is no dependency on wxUSE_MENUS when using CMake. --- build/cmake/options.cmake | 3 ++- build/cmake/samples/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake index edbb73d745..913f35542d 100644 --- a/build/cmake/options.cmake +++ b/build/cmake/options.cmake @@ -377,7 +377,8 @@ wx_option(wxUSE_WIZARDDLG "use wxWizard") # misc GUI options # --------------------------------------------------------------------------- -wx_option(wxUSE_MENUS "use wxMenu/wxMenuBar/wxMenuItem classes") +wx_option(wxUSE_MENUS "use wxMenu and wxMenuItem classes") +wx_option(wxUSE_MENUBAR "use wxMenuBar class") wx_option(wxUSE_MINIFRAME "use wxMiniFrame class") wx_option(wxUSE_TOOLTIPS "use wxToolTip class") wx_option(wxUSE_SPLINES "use spline drawing code") diff --git a/build/cmake/samples/CMakeLists.txt b/build/cmake/samples/CMakeLists.txt index fcf11fb681..0f02941a74 100644 --- a/build/cmake/samples/CMakeLists.txt +++ b/build/cmake/samples/CMakeLists.txt @@ -90,7 +90,7 @@ wx_add_sample(listctrl listtest.cpp listtest.h RES listtest.rc DEPENDS wxUSE_LIS wx_add_sample(mdi mdi.cpp mdi.h RES mdi.rc DEPENDS wxUSE_MDI wxUSE_DOC_VIEW_ARCHITECTURE wxUSE_MDI_ARCHITECTURE) wx_add_sample(mediaplayer LIBRARIES wxmedia DEPENDS wxUSE_MEDIACTRL) wx_add_sample(memcheck) -wx_add_sample(menu DEPENDS wxUSE_MENUS) +wx_add_sample(menu DEPENDS wxUSE_MENUS wxUSE_MENUBAR) wx_add_sample(minimal IMPORTANT) wx_add_sample(notebook notebook.cpp notebook.h LIBRARIES wxaui DEPENDS wxUSE_NOTEBOOK) if(wxUSE_OPENGL)