From 17158129a853fee645fc7de5c5037413b3cff4d8 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Tue, 17 Jul 2018 16:30:40 +0200 Subject: 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 --- toolchain/Android.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolchain/Android.cmake') 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() -- cgit v1.2.1