fix windows installs

Author: stephen-derosa

CMakeLists.txt

@@ -93,16 +93,3 @@ add_subdirectory(simple_joystick_sender)
 add_subdirectory(simple_joystick_receiver)
 add_subdirectory(ping_pong_ping)
 add_subdirectory(ping_pong_pong)
-
-livekit_copy_windows_runtime_dlls(basic_room)
-livekit_copy_windows_runtime_dlls(SimpleRoom)
-livekit_copy_windows_runtime_dlls(SimpleRpc)
-livekit_copy_windows_runtime_dlls(SimpleDataStream)
-livekit_copy_windows_runtime_dlls(LoggingLevelsBasicUsage)
-livekit_copy_windows_runtime_dlls(LoggingLevelsCustomSinks)
-livekit_copy_windows_runtime_dlls(HelloLivekitSender)
-livekit_copy_windows_runtime_dlls(HelloLivekitReceiver)
-livekit_copy_windows_runtime_dlls(SimpleJoystickSender)
-livekit_copy_windows_runtime_dlls(SimpleJoystickReceiver)
-livekit_copy_windows_runtime_dlls(PingPongPing)
-livekit_copy_windows_runtime_dlls(PingPongPong)

basic_room/CMakeLists.txt

@@ -27,18 +27,10 @@ get_filename_component(_lk_lib_dir  "${_lk_cmake_dir}" DIRECTORY) # .../lib
 target_link_directories(basic_room PRIVATE "${_lk_lib_dir}")
 
 
-# Nice-to-have: copy runtime DLLs next to the exe on Windows for "run from build dir".
-# Only do this if your exported package provides these targets.
+# Nice-to-have: copy extra runtime DLLs next to the exe on Windows for "run from build dir".
+# The common LiveKit runtime copies are handled by livekit_copy_windows_runtime_dlls()
+# in this target's directory below.
 if(WIN32)
-  # livekit_ffi.dll
-  if(TARGET LiveKit::livekit_ffi)
-    add_custom_command(TARGET basic_room POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "$<TARGET_FILE:LiveKit::livekit_ffi>"
-        "$<TARGET_FILE_DIR:basic_room>"
-    )
-  endif()
-
   # If you also export protobuf/abseil runtime targets, copy them too (optional).
   if(TARGET protobuf::libprotobuf)
     add_custom_command(TARGET basic_room POST_BUILD
@@ -53,6 +45,8 @@ if(WIN32)
       COMMAND ${CMAKE_COMMAND} -E copy_if_different
         "$<TARGET_FILE:absl::abseil_dll>"
         "$<TARGET_FILE_DIR:basic_room>"
-    )
+      )
   endif()
 endif()
+
+livekit_copy_windows_runtime_dlls(basic_room)

hello_livekit_receiver/CMakeLists.txt

@@ -18,3 +18,5 @@ add_executable(HelloLivekitReceiver
 
 target_include_directories(HelloLivekitReceiver PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(HelloLivekitReceiver PRIVATE ${LIVEKIT_CORE_TARGET})
+
+livekit_copy_windows_runtime_dlls(HelloLivekitReceiver)

hello_livekit_sender/CMakeLists.txt

@@ -18,3 +18,5 @@ add_executable(HelloLivekitSender
 
 target_include_directories(HelloLivekitSender PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(HelloLivekitSender PRIVATE ${LIVEKIT_CORE_TARGET})
+
+livekit_copy_windows_runtime_dlls(HelloLivekitSender)

logging_levels_basic_usage/CMakeLists.txt

@@ -18,3 +18,5 @@ add_executable(LoggingLevelsBasicUsage
 
 target_include_directories(LoggingLevelsBasicUsage PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(LoggingLevelsBasicUsage PRIVATE ${LIVEKIT_CORE_TARGET})
+
+livekit_copy_windows_runtime_dlls(LoggingLevelsBasicUsage)

logging_levels_custom_sinks/CMakeLists.txt

@@ -18,3 +18,5 @@ add_executable(LoggingLevelsCustomSinks
 
 target_include_directories(LoggingLevelsCustomSinks PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(LoggingLevelsCustomSinks PRIVATE ${LIVEKIT_CORE_TARGET})
+
+livekit_copy_windows_runtime_dlls(LoggingLevelsCustomSinks)

ping_pong_ping/CMakeLists.txt

@@ -29,3 +29,5 @@ add_executable(PingPongPing
 
 target_include_directories(PingPongPing PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(PingPongPing PRIVATE ping_pong_ping_support ${LIVEKIT_CORE_TARGET})
+
+livekit_copy_windows_runtime_dlls(PingPongPing)

ping_pong_pong/CMakeLists.txt

@@ -29,3 +29,5 @@ add_executable(PingPongPong
 
 target_include_directories(PingPongPong PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(PingPongPong PRIVATE ping_pong_pong_support ${LIVEKIT_CORE_TARGET})
+
+livekit_copy_windows_runtime_dlls(PingPongPong)

simple_data_stream/CMakeLists.txt

@@ -19,6 +19,8 @@ add_executable(SimpleDataStream
 target_include_directories(SimpleDataStream PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(SimpleDataStream PRIVATE ${LIVEKIT_CORE_TARGET})
 
+livekit_copy_windows_runtime_dlls(SimpleDataStream)
+
 if(LIVEKIT_DATA_DIR)
   add_custom_command(TARGET SimpleDataStream POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory

simple_joystick_receiver/CMakeLists.txt

@@ -28,3 +28,5 @@ add_executable(SimpleJoystickReceiver
 
 target_include_directories(SimpleJoystickReceiver PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(SimpleJoystickReceiver PRIVATE simple_joystick_receiver_support ${LIVEKIT_CORE_TARGET})
+
+livekit_copy_windows_runtime_dlls(SimpleJoystickReceiver)