From e037bc34611e58accc695e16680c8272d13ba5da Mon Sep 17 00:00:00 2001 From: rjindael Date: Mon, 17 Jul 2023 16:53:24 -0700 Subject: [PATCH] remove deployment code from CMake --- Projects/Client/Player/CMakeLists.txt | 7 ------- Projects/Client/Server/CMakeLists.txt | 7 ------- Projects/Client/Studio/CMakeLists.txt | 12 +----------- Projects/Engine/CMakeLists.txt | 16 +--------------- 4 files changed, 2 insertions(+), 40 deletions(-) diff --git a/Projects/Client/Player/CMakeLists.txt b/Projects/Client/Player/CMakeLists.txt index 868164f..798c405 100644 --- a/Projects/Client/Player/CMakeLists.txt +++ b/Projects/Client/Player/CMakeLists.txt @@ -18,13 +18,6 @@ endif() qt_add_executable(Player ${SOURCE} ${HEADER}) -if(MINGW) - add_custom_command(TARGET Player POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy -t $ $ - COMMAND_EXPAND_LISTS - ) -endif() - target_include_directories(Player PRIVATE Header) target_link_libraries(Player PRIVATE Common Engine) diff --git a/Projects/Client/Server/CMakeLists.txt b/Projects/Client/Server/CMakeLists.txt index f47982f..9b42ddc 100644 --- a/Projects/Client/Server/CMakeLists.txt +++ b/Projects/Client/Server/CMakeLists.txt @@ -9,12 +9,5 @@ endif() add_executable(Server ${SOURCE} ${HEADER}) -if(MINGW) - add_custom_command(TARGET Server POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy -t $ $ - COMMAND_EXPAND_LISTS - ) -endif() - target_include_directories(Server PRIVATE Header) target_link_libraries(Server PRIVATE Engine) \ No newline at end of file diff --git a/Projects/Client/Studio/CMakeLists.txt b/Projects/Client/Studio/CMakeLists.txt index 6866b77..d484964 100644 --- a/Projects/Client/Studio/CMakeLists.txt +++ b/Projects/Client/Studio/CMakeLists.txt @@ -20,20 +20,10 @@ endif() qt_add_executable(Studio ${SOURCE} ${HEADER}) -if(MINGW) - add_custom_command(TARGET Studio POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy -t $ $ - COMMAND_EXPAND_LISTS - ) -endif() - target_include_directories(Studio PRIVATE Header) target_link_libraries(Studio PRIVATE Common Engine) set_target_properties(Studio PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON -) - -install(TARGETS Studio - RUNTIME_DEPENDENCIES) \ No newline at end of file +) \ No newline at end of file diff --git a/Projects/Engine/CMakeLists.txt b/Projects/Engine/CMakeLists.txt index 8b60705..58e9803 100644 --- a/Projects/Engine/CMakeLists.txt +++ b/Projects/Engine/CMakeLists.txt @@ -51,18 +51,4 @@ add_library(Engine STATIC find_package(pugixml REQUIRED) target_include_directories(Engine PUBLIC ${BOOST_INCLUDE_DIRS} Header/) -target_link_libraries(Engine PUBLIC ${BOOST_LIBRARIES} pugixml OgreBites Luau.Analysis Luau.Ast Luau.Compiler Luau.VM) - -if(WIN32 OR MINGW) - file(COPY ${CMAKE_SOURCE_DIR}/Content/win32_plugins.cfg DESTINATION ${CMAKE_BINARY_DIR}) - file(RENAME ${CMAKE_BINARY_DIR}/win32_plugins.cfg ${CMAKE_BINARY_DIR}/plugins.cfg) - file(COPY ${OGRE_PLUGIN_DIR}/ DESTINATION ${CMAKE_BINARY_DIR}/plugins) -elseif(UNIX) - file(COPY ${CMAKE_SOURCE_DIR}/Content/linux_plugins.cfg DESTINATION ${CMAKE_BINARY_DIR}) - file(RENAME ${CMAKE_BINARY_DIR}/linux_plugins.cfg ${CMAKE_BINARY_DIR}/plugins.cfg) - file(COPY ${OGRE_PLUGIN_DIR}/ DESTINATION ${CMAKE_BINARY_DIR}/plugins) -endif() - -file(COPY ${CMAKE_SOURCE_DIR}/Content/RNR/ DESTINATION ${CMAKE_BINARY_DIR}/content) -file(COPY ${OGRE_MEDIA_DIR}/Main/ DESTINATION ${CMAKE_BINARY_DIR}/shaders) -file(COPY ${OGRE_MEDIA_DIR}/RTShaderLib/ DESTINATION ${CMAKE_BINARY_DIR}/shaders) \ No newline at end of file +target_link_libraries(Engine PUBLIC ${BOOST_LIBRARIES} pugixml OgreBites Luau.Analysis Luau.Ast Luau.Compiler Luau.VM) \ No newline at end of file