From 7db4a75913fb627c1d1c169dc51e5468ebb7a148 Mon Sep 17 00:00:00 2001 From: PatTheMav Date: Mon, 9 Dec 2024 21:42:42 +0100 Subject: [PATCH] cmake: Update main CMakeLists file to use refactored frontend --- CMakeLists.txt | 2 +- cmake/linux/cpackconfig.cmake | 2 +- cmake/windows/cpackconfig.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a45780d1..d3fcec13b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,6 @@ add_subdirectory(plugins) add_subdirectory(test/test-input) -add_subdirectory(UI) +add_subdirectory(frontend) message_configuration() diff --git a/cmake/linux/cpackconfig.cmake b/cmake/linux/cpackconfig.cmake index f8b7869db..37eeaa035 100644 --- a/cmake/linux/cpackconfig.cmake +++ b/cmake/linux/cpackconfig.cmake @@ -5,7 +5,7 @@ include_guard(GLOBAL) include(cpackconfig_common) # Add GPLv2 license file to CPack -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/UI/data/license/gplv2.txt") +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/frontend/data/license/gplv2.txt") set(CPACK_PACKAGE_EXECUTABLES "obs") if(ENABLE_RELEASE_BUILD) diff --git a/cmake/windows/cpackconfig.cmake b/cmake/windows/cpackconfig.cmake index 2191e34dc..f51832fbd 100644 --- a/cmake/windows/cpackconfig.cmake +++ b/cmake/windows/cpackconfig.cmake @@ -5,7 +5,7 @@ include_guard(GLOBAL) include(cpackconfig_common) # Add GPLv2 license file to CPack -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/UI/data/license/gplv2.txt") +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/frontend/data/license/gplv2.txt") set(CPACK_PACKAGE_VERSION "${OBS_VERSION_CANONICAL}") set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-windows-${CMAKE_VS_PLATFORM_NAME}") set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY FALSE)