diff options
| author | fuzzard <fuzzard@kodi.tv> | 2023-09-21 20:08:09 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2023-09-24 14:10:44 +1000 |
| commit | 35ef8b175c5fe81e44c6028880e3e39cd600b0c7 (patch) | |
| tree | 692a9e6bcbfcf5cf69e54c97dff0cc752195e9c2 /cmake | |
| parent | 574208b21069dbdab8c7c0c8f66f94c79d17476e (diff) | |
[cmake] unset *_LIBRARIES populated from select_library_configurations
This will remove a lot of duplication due to the core_*_dep macros. With TARGET usage
we dont need to append every library to a single variable. TARGETS will handle
deduplication (to a certain point)
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindCrossGUID.cmake | 1 | ||||
| -rw-r--r-- | cmake/modules/FindFmt.cmake | 1 | ||||
| -rw-r--r-- | cmake/modules/FindPCRE.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/FindSpdlog.cmake | 1 | ||||
| -rw-r--r-- | cmake/modules/FindTagLib.cmake | 1 | ||||
| -rw-r--r-- | cmake/modules/FindTinyXML2.cmake | 1 |
6 files changed, 7 insertions, 0 deletions
diff --git a/cmake/modules/FindCrossGUID.cmake b/cmake/modules/FindCrossGUID.cmake index 5ba39e3cb4..a8331a2a75 100644 --- a/cmake/modules/FindCrossGUID.cmake +++ b/cmake/modules/FindCrossGUID.cmake @@ -67,6 +67,7 @@ if(NOT TARGET CrossGUID::CrossGUID) # Select relevant lib build type (ie CROSSGUID_LIBRARY_RELEASE or CROSSGUID_LIBRARY_DEBUG) include(SelectLibraryConfigurations) select_library_configurations(CROSSGUID) + unset(CROSSGUID_LIBRARIES) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(CrossGUID diff --git a/cmake/modules/FindFmt.cmake b/cmake/modules/FindFmt.cmake index a6b844532c..d75924c935 100644 --- a/cmake/modules/FindFmt.cmake +++ b/cmake/modules/FindFmt.cmake @@ -162,6 +162,7 @@ if(NOT TARGET fmt::fmt OR Fmt_FIND_REQUIRED) include(SelectLibraryConfigurations) select_library_configurations(FMT) + unset(FMT_LIBRARIES) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Fmt diff --git a/cmake/modules/FindPCRE.cmake b/cmake/modules/FindPCRE.cmake index e650802184..8197a67948 100644 --- a/cmake/modules/FindPCRE.cmake +++ b/cmake/modules/FindPCRE.cmake @@ -147,6 +147,8 @@ if(NOT PCRE::pcre) include(SelectLibraryConfigurations) select_library_configurations(PCRECPP) select_library_configurations(PCRE) + unset(PCRECPP_LIBRARIES) + unset(PCRE_LIBRARIES) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(PCRE diff --git a/cmake/modules/FindSpdlog.cmake b/cmake/modules/FindSpdlog.cmake index 9ef855cbbe..6fdd969f88 100644 --- a/cmake/modules/FindSpdlog.cmake +++ b/cmake/modules/FindSpdlog.cmake @@ -129,6 +129,7 @@ if(NOT TARGET spdlog::spdlog) include(SelectLibraryConfigurations) select_library_configurations(SPDLOG) + unset(SPDLOG_LIBRARIES) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Spdlog diff --git a/cmake/modules/FindTagLib.cmake b/cmake/modules/FindTagLib.cmake index 311d9e7ef8..cdfe873682 100644 --- a/cmake/modules/FindTagLib.cmake +++ b/cmake/modules/FindTagLib.cmake @@ -82,6 +82,7 @@ if(NOT TARGET TagLib::TagLib) include(SelectLibraryConfigurations) select_library_configurations(TAGLIB) + unset(TAGLIB_LIBRARIES) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(TagLib diff --git a/cmake/modules/FindTinyXML2.cmake b/cmake/modules/FindTinyXML2.cmake index 709eeefabd..1840a1e331 100644 --- a/cmake/modules/FindTinyXML2.cmake +++ b/cmake/modules/FindTinyXML2.cmake @@ -109,6 +109,7 @@ if(NOT TARGET tinyxml2::tinyxml2) include(SelectLibraryConfigurations) select_library_configurations(TINYXML2) + unset(TINYXML2_LIBRARIES) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(TinyXML2 |