jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: Fix CMake package export templates for CMake 3.24 

CMake 3.24 implemented changes that break dependency discovery of the
exported libraries built by OBS.
master
PatTheMav 2022-08-09 23:50:38 +02:00 committed by Ryan Foster
parent 7f3ea4e00c
commit 43a49dca47
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/w32-pthreads/cmake/w32-pthreadsConfig.cmake.in vendored
View File

@ -2,5 +2,3 @@
include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
check_required_components("@PROJECT_NAME@")
set(LIBOBS_LIBRARIES w32-pthreads)

13
libobs/cmake/libobsConfig.cmake.in
View File

@ -1,14 +1,15 @@
@PACKAGE_INIT@
include(CMakeFindDependencyMacro)
if(MSVC)
find_dependency(w32-pthreads REQUIRED)
endif()
find_dependency(Threads REQUIRED)
include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
check_required_components("@PROJECT_NAME@")
if(MSVC)
find_package(w32-pthreads REQUIRED)
endif()
find_package(Threads REQUIRED)
set(LIBOBS_PLUGIN_DESTINATION "@PACKAGE_OBS_PLUGIN_DESTINATION@")
set(LIBOBS_PLUGIN_DATA_DESTINATION "@PACKAGE_OBS_DATA_DESTINATION@/obs-plugins")