From 21615b16347e6ccb8380a4bc5344a16058d55427 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Wed, 10 Jan 2018 22:56:42 +0100
Subject: [PATCH] CMake: Set Visual Studio working directory

Use the executable output directory for samples and demos, use the source directory for tests.
---
 build/cmake/demos/CMakeLists.txt | 3 +++
 build/cmake/functions.cmake      | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/build/cmake/demos/CMakeLists.txt b/build/cmake/demos/CMakeLists.txt
index a905d3e857..e8f7f7d412 100644
--- a/build/cmake/demos/CMakeLists.txt
+++ b/build/cmake/demos/CMakeLists.txt
@@ -38,6 +38,9 @@ function(wx_add_demo name)
     target_link_libraries(${DEMO_NAME} core ${DEMO_LIBRARIES})
     wx_set_common_target_properties(${DEMO_NAME})
     set_target_properties(${DEMO_NAME} PROPERTIES FOLDER "Demos")
+    set_target_properties(${DEMO_NAME} PROPERTIES
+        VS_DEBUGGER_WORKING_DIRECTORY "${wxOUTPUT_DIR}/${wxCOMPILER_PREFIX}${wxARCH_SUFFIX}_${lib_suffix}"
+        )
 endfunction()
 
 wx_add_demo(bombs
diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index c2c28b8c5a..75e0f1f2ba 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -610,6 +610,9 @@ function(wx_add_sample name)
     set_target_properties(${target_name} PROPERTIES
         FOLDER ${folder}
         )
+    set_target_properties(${target_name} PROPERTIES
+        VS_DEBUGGER_WORKING_DIRECTORY "${wxOUTPUT_DIR}/${wxCOMPILER_PREFIX}${wxARCH_SUFFIX}_${lib_suffix}"
+        )
 endfunction()
 
 # Link libraries to a sample
@@ -704,6 +707,9 @@ function(wx_add_test name)
     endif()
     wx_set_common_target_properties(${name})
     set_target_properties(${name} PROPERTIES FOLDER "Tests")
+    set_target_properties(${name} PROPERTIES
+        VS_DEBUGGER_WORKING_DIRECTORY "${wxSOURCE_DIR}/tests"
+        )
 
     add_test(NAME ${name}
         COMMAND ${name}