Test no add_subdirectory

obsproject · Jan 27, 2024 · 52706b9 · 52706b9
1 parent f9b233d
commit 52706b9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 27 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ legacy_check()
 set(obs-websocket_VERSION 5.4.0)
 set(OBS_WEBSOCKET_RPC_VERSION 1)
 
-add_subdirectory(lib)
+include(cmake/obs-websocket-api.cmake)
 
 option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON)
 if(NOT ENABLE_WEBSOCKET)

diff --git a/cmake/legacy.cmake b/cmake/legacy.cmake
@@ -3,7 +3,21 @@ set(OBS_WEBSOCKET_RPC_VERSION 1)
 
 option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON)
 
-add_subdirectory(lib)
+add_library(obs-websocket-api INTERFACE)
+add_library(OBS::websocket-api ALIAS obs-websocket-api)
+
+target_sources(obs-websocket-api INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/obs-websocket-api.h>
+                                           $<INSTALL_INTERFACE:${OBS_INCLUDE_DESTINATION}/obs-websocket-api.h>)
+
+target_link_libraries(obs-websocket-api INTERFACE OBS::libobs)
+
+target_include_directories(obs-websocket-api INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+                                                       $<INSTALL_INTERFACE:${OBS_INCLUDE_DESTINATION}>)
+
+set_target_properties(obs-websocket-api PROPERTIES FOLDER "plugins/obs-websocket/lib" PUBLIC_HEADER
+                                                                                      lib/obs-websocket-api.h)
+
+export_target(obs-websocket-api)
 
 if(NOT ENABLE_WEBSOCKET OR NOT ENABLE_UI)
   message(STATUS "OBS:  DISABLED   obs-websocket")

diff --git a/lib/CMakeLists.txt → cmake/obs-websocket-api.cmake b/lib/CMakeLists.txt → cmake/obs-websocket-api.cmake
@@ -1,7 +1,3 @@
-cmake_minimum_required(VERSION 3.22...3.25)
-
-legacy_check()
-
 add_library(obs-websocket-api INTERFACE)
 add_library(OBS::websocket-api ALIAS obs-websocket-api)
 
@@ -17,6 +13,6 @@ set_target_properties(
   obs-websocket-api
   PROPERTIES FOLDER plugins/obs-websocket
              PREFIX ""
-             PUBLIC_HEADER obs-websocket-api.h)
+             PUBLIC_HEADER lib/obs-websocket-api.h)
 
 target_export(obs-websocket-api)
diff --git a/lib/cmake/obs-websocket-apiConfig.cmake.in → cmake/obs-websocket-apiConfig.cmake.in b/lib/cmake/obs-websocket-apiConfig.cmake.in → cmake/obs-websocket-apiConfig.cmake.in
diff --git a/lib/cmake/legacy.cmake b/lib/cmake/legacy.cmake