소스 검색

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.
PatTheMav 3 년 전
부모
커밋
43a49dca47
2개의 변경된 파일5개의 추가작업 그리고 6개의 파일을 삭제
  1. 0 2
      deps/w32-pthreads/cmake/w32-pthreadsConfig.cmake.in
  2. 5 4
      libobs/cmake/libobsConfig.cmake.in

+ 0 - 2
deps/w32-pthreads/cmake/w32-pthreadsConfig.cmake.in

@@ -2,5 +2,3 @@
 
 include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
 check_required_components("@PROJECT_NAME@")
-
-set(LIBOBS_LIBRARIES w32-pthreads)

+ 5 - 4
libobs/cmake/libobsConfig.cmake.in

@@ -1,13 +1,14 @@
 @PACKAGE_INIT@
 
-include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
-check_required_components("@PROJECT_NAME@")
+include(CMakeFindDependencyMacro)
 
 if(MSVC)
-  find_package(w32-pthreads REQUIRED)
+  find_dependency(w32-pthreads REQUIRED)
 endif()
+find_dependency(Threads REQUIRED)
 
-find_package(Threads REQUIRED)
+include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
+check_required_components("@PROJECT_NAME@")
 
 set(LIBOBS_PLUGIN_DESTINATION "@PACKAGE_OBS_PLUGIN_DESTINATION@")
 set(LIBOBS_PLUGIN_DATA_DESTINATION "@PACKAGE_OBS_DATA_DESTINATION@/obs-plugins")