From 3978733a379fd3fcfd89fa4833105e907aca936f Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Thu, 26 Mar 2020 23:35:01 +0100 Subject: [PATCH] CMake: Enable DPI awareness options for demos --- build/cmake/demos/CMakeLists.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/build/cmake/demos/CMakeLists.txt b/build/cmake/demos/CMakeLists.txt index 7339631c14..37d296f977 100644 --- a/build/cmake/demos/CMakeLists.txt +++ b/build/cmake/demos/CMakeLists.txt @@ -18,7 +18,28 @@ function(wx_add_demo name) if(WIN32) list(APPEND src_files ${wxSOURCE_DIR}/demos/${name}/${DEMO_NAME}.rc) endif() + + if (WXMSW AND DEFINED wxUSE_DPI_AWARE_MANIFEST) + set(wxDPI_MANIFEST_PRFIX "wx") + if (wxARCH_SUFFIX) + set(wxDPI_MANIFEST_PRFIX "amd64") + endif() + set(wxUSE_DPI_AWARE_MANIFEST_VALUE 0) + if (${wxUSE_DPI_AWARE_MANIFEST} MATCHES "system") + set(wxUSE_DPI_AWARE_MANIFEST_VALUE 1) + list(APPEND src_files "${wxSOURCE_DIR}/include/wx/msw/${wxDPI_MANIFEST_PRFIX}_dpi_aware.manifest") + elseif(${wxUSE_DPI_AWARE_MANIFEST} MATCHES "per-monitor") + set(wxUSE_DPI_AWARE_MANIFEST_VALUE 2) + list(APPEND src_files "${wxSOURCE_DIR}/include/wx/msw/${wxDPI_MANIFEST_PRFIX}_dpi_aware_pmv2.manifest") + endif() + endif() + add_executable(${DEMO_NAME} WIN32 MACOSX_BUNDLE ${src_files}) + + if (DEFINED wxUSE_DPI_AWARE_MANIFEST_VALUE) + target_compile_definitions(${DEMO_NAME} PRIVATE wxUSE_DPI_AWARE_MANIFEST=${wxUSE_DPI_AWARE_MANIFEST_VALUE}) + endif() + if(DEMO_DATA) # TODO: unify with data handling for samples # TODO: handle data files differently for OS X bundles