From 5d479a081996d26ef0d4d46d344de01a048fa0eb Mon Sep 17 00:00:00 2001 From: Steven Noonan Date: Wed, 7 Oct 2020 14:28:23 -0700 Subject: [PATCH] CMake: move install of steamwebrtc/webrtc-lite to steamwebrtc CMakeLists Signed-off-by: Steven Noonan --- src/CMakeLists.txt | 5 ----- src/external/steamwebrtc/CMakeLists.txt | 8 ++++++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f977ebc..9b12c88 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -292,15 +292,10 @@ gamenetworkingsockets_common(GameNetworkingSockets_s) # Install rules -if(USE_STEAMWEBRTC) - set(CONDITIONAL_WEBRTC_TARGET steamwebrtc webrtc-lite) -endif() - install( TARGETS GameNetworkingSockets GameNetworkingSockets_s - ${CONDITIONAL_WEBRTC_TARGET} EXPORT GameNetworkingSockets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/src/external/steamwebrtc/CMakeLists.txt b/src/external/steamwebrtc/CMakeLists.txt index 4373cf6..af35d55 100644 --- a/src/external/steamwebrtc/CMakeLists.txt +++ b/src/external/steamwebrtc/CMakeLists.txt @@ -773,3 +773,11 @@ set_target_properties(steamwebrtc PROPERTIES ) set_property(TARGET steamwebrtc PROPERTY POSITION_INDEPENDENT_CODE ON) + +install( + TARGETS + steamwebrtc webrtc-lite + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + )