From 56ffc3f88c2b977ecb1e9e48aab0e1a9e4e17ac0 Mon Sep 17 00:00:00 2001 From: maelstrom Date: Tue, 12 Aug 2025 00:19:15 +0200 Subject: [PATCH] fix(cmake): copy assets --- client/CMakeLists.txt | 11 ++++++++++- editor/CMakeLists.txt | 16 ++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 259fdb1..ca5cc26 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -2,4 +2,13 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/deps.cmake) add_executable(client "src/main.cpp") target_link_libraries(client PRIVATE openblocks glfw) -add_dependencies(client openblocks) \ No newline at end of file +add_dependencies(client openblocks) + +if(WIN32) + # Copy assets + add_custom_command( + TARGET client POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory + ${CMAKE_SOURCE_DIR}/assets + $/assets) +endif() \ No newline at end of file diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt index 6050905..145445a 100644 --- a/editor/CMakeLists.txt +++ b/editor/CMakeLists.txt @@ -39,17 +39,21 @@ qt_add_executable(editor MANUAL_FINALIZATION ${PROJECT_SOURCES}) target_include_directories(editor PRIVATE .) target_link_libraries(editor PRIVATE openblocks Qt6::Widgets Qt6::OpenGLWidgets ${QSCINTILLA_LIBRARY}) -# Copy assets -add_custom_command( - TARGET editor POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory - ${CMAKE_SOURCE_DIR}/assets - $/assets) +set_target_properties(editor PROPERTIES + WIN32_EXECUTABLE ON +) # Copy Qt files if (WIN32) #include("${QT_DEPLOY_SUPPORT}") + # Copy assets + add_custom_command( + TARGET editor POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory + ${CMAKE_SOURCE_DIR}/assets + $/assets) + # Copy over QScintilla DLLs # TODO: Use a better approach? add_custom_command(