From 4d35e8e54d22ae147295fb8510601afc4ea9d967 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 10 Jan 2018 22:48:39 +0100 Subject: [PATCH] CMake: Copy demo and sample data files to correct directory Instead of 'lib/', copy it to directory where the executables are (e.g. 'lib/vc_x64_lib/'). --- build/cmake/demos/CMakeLists.txt | 2 +- build/cmake/functions.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/cmake/demos/CMakeLists.txt b/build/cmake/demos/CMakeLists.txt index ee5f973dc9..a905d3e857 100644 --- a/build/cmake/demos/CMakeLists.txt +++ b/build/cmake/demos/CMakeLists.txt @@ -26,7 +26,7 @@ function(wx_add_demo name) foreach(data_file ${DEMO_DATA}) list(APPEND cmds COMMAND ${CMAKE_COMMAND} -E copy ${wxSOURCE_DIR}/demos/${name}/${data_file} - ${wxOUTPUT_DIR}/${data_file}) + ${wxOUTPUT_DIR}/${wxPLATFORM_LIB_DIR}/${data_file}) endforeach() add_custom_command( TARGET ${DEMO_NAME} ${cmds} diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake index 4edd9c8ff2..1720672ea7 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake @@ -574,7 +574,7 @@ function(wx_add_sample name) foreach(data_file ${SAMPLE_DATA}) list(APPEND cmds COMMAND ${CMAKE_COMMAND} -E copy ${wxSOURCE_DIR}/samples/${wxSAMPLE_SUBDIR}${name}/${data_file} - ${wxOUTPUT_DIR}/${data_file}) + ${wxOUTPUT_DIR}/${wxPLATFORM_LIB_DIR}/${data_file}) endforeach() add_custom_command( TARGET ${target_name} ${cmds}