diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2022-06-22 19:32:53 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-22 19:32:53 +1000 |
| commit | f4d4cd64021473e1f11d71a4a343b58b81c49dcf (patch) | |
| tree | f74ed2cea8fb611e4a9d29b13b9c3865044ee515 | |
| parent | 9543be316a96bcdd8be314909afe226621447869 (diff) | |
| parent | be9d990e260f9457afbaf6c33d8180430c1efa65 (diff) | |
Merge pull request #21589 from fuzzard/fix_cmakelibdvd
[cmake] Fix libdvd build failure after #21579
| -rw-r--r-- | cmake/modules/FindLibDvd.cmake | 11 | ||||
| -rw-r--r-- | cmake/scripts/common/ModuleHelpers.cmake | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/cmake/modules/FindLibDvd.cmake b/cmake/modules/FindLibDvd.cmake index 8679917bcc..66ed0f5c14 100644 --- a/cmake/modules/FindLibDvd.cmake +++ b/cmake/modules/FindLibDvd.cmake @@ -74,7 +74,14 @@ else() if(ENABLE_DVDCSS) list(APPEND dvdlibs libdvdcss) endif() - set(DEPENDS_TARGETS_DIR ${CMAKE_SOURCE_DIR}/tools/depends/target) + + # Set variables normally set in SETUP_BUILD_VARS macro + set(LIB_TYPE "target") + set(PROJECTSOURCE ${CMAKE_SOURCE_DIR}) + set(DEP_LOCATION "${DEPENDS_PATH}") + + # clear any potentially set variables + CLEAR_BUILD_VARS() foreach(dvdlib ${dvdlibs}) @@ -82,7 +89,7 @@ else() # Variables required being set for clean get_versionfile_data use set(MODULE_LC ${dvdlib}) - set(PROJECTSOURCE ${CMAKE_SOURCE_DIR}) + get_versionfile_data() # allow user to override the download URL with a local tarball diff --git a/cmake/scripts/common/ModuleHelpers.cmake b/cmake/scripts/common/ModuleHelpers.cmake index 916e30dd22..62e6952675 100644 --- a/cmake/scripts/common/ModuleHelpers.cmake +++ b/cmake/scripts/common/ModuleHelpers.cmake @@ -131,6 +131,10 @@ macro(SETUP_BUILD_VARS) message(STATUS "${MODULE}_URL: ${${MODULE}_URL}") endif() + CLEAR_BUILD_VARS() +endmacro() + +macro(CLEAR_BUILD_VARS) # unset all build_dep_target variables to insure clean state unset(BUILD_NAME) unset(INSTALL_DIR) |