diff options
| author | Aleix Pol <aleixpol@kde.org> | 2018-07-17 16:30:40 +0200 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2018-07-18 01:16:31 +0200 |
| commit | 17158129a853fee645fc7de5c5037413b3cff4d8 (patch) | |
| tree | 4ff8372ebf85733d6ae106a7026f169d68187a5e /toolchain | |
| parent | f19f90956b4daf457eba2eb12342ed211d2dc147 (diff) | |
| download | extra-cmake-modules-17158129a853fee645fc7de5c5037413b3cff4d8.tar.gz extra-cmake-modules-17158129a853fee645fc7de5c5037413b3cff4d8.tar.bz2 | |
Fix variable definition check
Summary:
We'd check if the variable's value is defined, which is wrong and prevented us
from properly initialising using these deprecated variables.
It would also ignore the value we're passing to the actually right variable when
using it.
Test Plan: Built kstars which needs -DCMAKE_ANDROID_API=24
Reviewers: #frameworks, vkrause
Reviewed By: vkrause
Subscribers: kde-frameworks-devel, kde-buildsystem
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D14187
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/Android.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index ab0fbcc0..b6cce6c1 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -144,7 +144,7 @@ cmake_minimum_required(VERSION "3.7") macro(set_deprecated_variable actual_variable deprecated_variable default_value) set(${deprecated_variable} "${default_value}" CACHE STRING "Deprecated. Use ${actual_variable}") - if (NOT DEFINED ${${actual_variable}}) + if (NOT DEFINED ${actual_variable}) set(${actual_variable} ${${deprecated_variable}}) endif() endmacro() |