From 53dbff296243a141274a65e947349c0dd10b0712 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Fri, 14 Sep 2018 21:41:49 +0200 Subject: [PATCH] CMake: Fix building dialogs sample Add the source files of the generic dialogs to the project, similar as is done in the bakefile. See previous commits 573e887a4c00bd3e050d7ca27a3546467969feba and 6415bd553fc16863a7dcf5a6242a4aec270f0dcc, which partially reverted it, for the full story. --- build/cmake/samples/CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/build/cmake/samples/CMakeLists.txt b/build/cmake/samples/CMakeLists.txt index a09ff9c26d..0e19f47d72 100644 --- a/build/cmake/samples/CMakeLists.txt +++ b/build/cmake/samples/CMakeLists.txt @@ -23,7 +23,17 @@ wx_add_sample(dataview IMPORTANT dataview.cpp mymodels.cpp mymodels.h DEPENDS wx 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 DATA tips.txt) +set(SAMPLE_DIALOGS_SRC dialogs.cpp dialogs.h) +if(NOT wxBUILD_SHARED AND (WXMSW OR APPLE)) # AND NOT WXUNIV + wx_list_add_prefix(SAMPLE_DIALOGS_SRC ../../src/generic/ colrdlgg.cpp dirdlgg.cpp filedlgg.cpp) + if(WXMSW) + wx_list_add_prefix(SAMPLE_DIALOGS_SRC ../../src/generic/ fontdlgg.cpp) + endif() +endif() +if(WXGTK2) + wx_list_add_prefix(SAMPLE_DIALOGS_SRC ../../src/generic/ filedlgg.cpp) +endif() +wx_add_sample(dialogs ${SAMPLE_DIALOGS_SRC} 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)