From 9bedeedcb66288af8308e6dfddc535175b3696b2 Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Fri, 22 May 2020 19:41:48 +0200 Subject: [PATCH] fix issue with out-of-tree builds not being able to find *ui on some platforms --- CMakeLists.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7639a6b..74d433cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,9 +8,6 @@ if(BUILD_OUT_OF_TREE) set(CMAKE_PREFIX_PATH "${QTDIR}") set(CMAKE_INCLUDE_CURRENT_DIR ON) list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/external") - set(CMAKE_AUTOMOC ON) - set(CMAKE_AUTOUIC ON) - include(external/FindLibObs.cmake) find_package(LibObs REQUIRED) @@ -82,6 +79,10 @@ if(BUILD_OUT_OF_TREE) Xss) endif() + qt5_wrap_ui(advanced-scene-switcher_UI_HEADERS + ${advanced-scene-switcher_UI} + ${advanced-scene-switcher_PLATFORM_UI}) + add_library(advanced-scene-switcher MODULE ${advanced-scene-switcher_HEADERS} ${advanced-scene-switcher_SOURCES} @@ -182,6 +183,7 @@ else () src/pause-switch.cpp src/random.cpp ) + set(advanced-scene-switcher_UI ${advanced-scene-switcher_UI} forms/advanced-scene-switcher.ui @@ -190,13 +192,11 @@ else () if(WIN32) set(advanced-scene-switcher_PLATFORM_SOURCES src/win/advanced-scene-switcher-win.cpp) - elseif(APPLE) set(advanced-scene-switcher_PLATFORM_SOURCES src/osx/advanced-scene-switcher-osx.mm) set_source_files_properties(advanced-scene-switcher-osx.mm PROPERTIES COMPILE_FLAGS "-fobjc-arc") - set(advanced-scene-switcher_PLATFORM_LIBS ${COCOA}) else() @@ -217,6 +217,7 @@ else () ${advanced-scene-switcher_PLATFORM_SOURCES} ${advanced-scene-switcher_PLATFORM_HEADERS} ) + target_link_libraries(advanced-scene-switcher ${advanced-scene-switcher_PLATFORM_LIBS} obs-frontend-api @@ -224,4 +225,4 @@ else () libobs) install_obs_plugin(advanced-scene-switcher data) -endif() \ No newline at end of file +endif()