From 5ca19288f6396a4761f1b54f991b08e9cdec8ceb Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sat, 20 Jan 2018 17:30:25 +0100 Subject: [PATCH] CMake: Fix building samples with MinGW64 Do not enable debugrpt and flash examples. Define UNICODE when building on Windows. This allows the sdk_exe example to build, because it includes the windows headers directly. --- build/cmake/functions.cmake | 3 +++ build/cmake/samples/CMakeLists.txt | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake index c92abdd9e4..87cd46ef36 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake @@ -166,6 +166,9 @@ function(wx_set_target_properties target_name is_base) endif() if(wxUSE_UNICODE) + if(WIN32) + target_compile_definitions(${target_name} PUBLIC UNICODE) + endif() target_compile_definitions(${target_name} PUBLIC _UNICODE) endif() diff --git a/build/cmake/samples/CMakeLists.txt b/build/cmake/samples/CMakeLists.txt index f8b7ac28fa..51eae43b51 100644 --- a/build/cmake/samples/CMakeLists.txt +++ b/build/cmake/samples/CMakeLists.txt @@ -19,7 +19,9 @@ wx_add_sample(combo LIBRARIES adv DATA dropbuth.png dropbutn.png dropbutp.png) wx_add_sample(config conftest.cpp) wx_add_sample(console CONSOLE IMPORTANT) wx_add_sample(dataview IMPORTANT dataview.cpp mymodels.cpp mymodels.h LIBRARIES adv) -wx_add_sample(debugrpt LIBRARIES qa) +if(wxUSE_ON_FATAL_EXCEPTION AND (NOT WIN32 OR MSVC)) + wx_add_sample(debugrpt LIBRARIES qa) +endif() wx_add_sample(dialogs dialogs.cpp dialogs.h LIBRARIES adv DATA tips.txt) wx_add_sample(dialup nettest.cpp) wx_add_sample(display) @@ -229,7 +231,9 @@ if(WIN32) endif() wx_add_sample(dll sdk_exe.cpp my_dll.h NAME sdk_exe FOLDER dll LIBRARIES my_dll) - wx_add_sample(flash) + if(MSVC) + wx_add_sample(flash) + endif() #TODO: renable when sample is fixed #wx_add_sample(mfc mfctest.cpp mfctest.h resource.h stdafx.h RES mfctest.rc) wx_add_sample(nativdlg nativdlg.cpp nativdlg.h resource.h RES nativdlg.rc)