cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Copy demo and sample data files to correct directory

Browse Source 
Instead of 'lib/', copy it to directory where the executables are (e.g. 'lib/vc_x64_lib/').
This commit is contained in:
Maarten Bent 2018-01-10 22:48:39 +01:00
parent 6ec4489189
commit 4d35e8e54d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/cmake/demos/CMakeLists.txt
View File

@ -26,7 +26,7 @@ function(wx_add_demo name)
foreach(data_file ${DEMO_DATA}) foreach(data_file ${DEMO_DATA})
list(APPEND cmds COMMAND ${CMAKE_COMMAND} list(APPEND cmds COMMAND ${CMAKE_COMMAND}
-E copy ${wxSOURCE_DIR}/demos/${name}/${data_file} -E copy ${wxSOURCE_DIR}/demos/${name}/${data_file}
${wxOUTPUT_DIR}/${data_file}) ${wxOUTPUT_DIR}/${wxPLATFORM_LIB_DIR}/${data_file})
endforeach() endforeach()
add_custom_command( add_custom_command(
TARGET ${DEMO_NAME} ${cmds} TARGET ${DEMO_NAME} ${cmds}

2
build/cmake/functions.cmake
View File

@ -574,7 +574,7 @@ function(wx_add_sample name)
foreach(data_file ${SAMPLE_DATA}) foreach(data_file ${SAMPLE_DATA})
list(APPEND cmds COMMAND ${CMAKE_COMMAND} list(APPEND cmds COMMAND ${CMAKE_COMMAND}
-E copy ${wxSOURCE_DIR}/samples/${wxSAMPLE_SUBDIR}${name}/${data_file} -E copy ${wxSOURCE_DIR}/samples/${wxSAMPLE_SUBDIR}${name}/${data_file}
${wxOUTPUT_DIR}/${data_file}) ${wxOUTPUT_DIR}/${wxPLATFORM_LIB_DIR}/${data_file})
endforeach() endforeach()
add_custom_command( add_custom_command(
TARGET ${target_name} ${cmds} TARGET ${target_name} ${cmds}