* Fixed copying of CEF locales and missing copy on Linux

diff --git a/modules/html/CMakeLists.txt b/modules/html/CMakeLists.txt
index 43da6f5139025869fc099602d107ffd35610125d..642606f53ce5f0ae94b8f0205bd46b08508ae9b4 100644 (file)
--- a/modules/html/CMakeLists.txt
+++ b/modules/html/CMakeLists.txt
@@ -69,4 +69,5 @@ if(MSVC)
 else()
        casparcg_add_runtime_dependency("${CEF_BIN_PATH}/libcef.so")
        casparcg_add_runtime_dependency("${CEF_BIN_PATH}/libffmpegsumo.so")
+       casparcg_add_runtime_dependency("${CEF_BIN_PATH}/libudev.so.0")
 endif()

diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index c6ae706ef7af0ecd2bc9a2304150f418c0a48f4c..800c2e810b9da755cbd9904abf7930f8b9f70dc5 100644 (file)
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -67,8 +67,9 @@ set(OUTPUT_FOLDER "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}")
 
 foreach(FILE_TO_COPY ${CASPARCG_RUNTIME_DEPENDENCIES})
        if(IS_DIRECTORY ${FILE_TO_COPY})
-               add_custom_command(TARGET casparcg_copy_dependencies POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory \"${FILE_TO_COPY}\" \"${OUTPUT_FOLDER}/\")
-               add_custom_command(TARGET casparcg_copy_dependencies POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory \"${FILE_TO_COPY}\" \"${CMAKE_CURRENT_BINARY_DIR}/\")
+               get_filename_component(FOLDER_NAME "${FILE_TO_COPY}" NAME)
+               add_custom_command(TARGET casparcg_copy_dependencies POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory \"${FILE_TO_COPY}\" \"${OUTPUT_FOLDER}/${FOLDER_NAME}\")
+               add_custom_command(TARGET casparcg_copy_dependencies POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory \"${FILE_TO_COPY}\" \"${CMAKE_CURRENT_BINARY_DIR}/${FOLDER_NAME}\")
        else()
                add_custom_command(TARGET casparcg_copy_dependencies POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy \"${FILE_TO_COPY}\" \"${OUTPUT_FOLDER}/\")
                add_custom_command(TARGET casparcg_copy_dependencies POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy \"${FILE_TO_COPY}\" \"${CMAKE_CURRENT_BINARY_DIR}/\")