diff options
author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-06-14 18:50:13 +0000 |
---|---|---|
committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-06-14 18:50:13 +0000 |
commit | ecc41e97ec2d54bbbcc2251ef85c1b5952aa230a (patch) | |
tree | ab728fd5e2b4e4fe915fb9922c4ad44da2ef567d | |
parent | 8b93b70a72c82f431dbcea38b8773cffb0fc90a8 (diff) | |
download | navit-svn-ecc41e97ec2d54bbbcc2251ef85c1b5952aa230a.tar.gz |
Refactor:build/cmake:Better comments & variable name.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5535 ffa7fe5e-494d-0410-b361-a75ebd5db220
-rw-r--r-- | cmake/navit_macros.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmake/navit_macros.cmake b/cmake/navit_macros.cmake index cb64f37b..6d4fa3c1 100644 --- a/cmake/navit_macros.cmake +++ b/cmake/navit_macros.cmake @@ -1,14 +1,14 @@ macro(set_feature_switch_default VARIABLE REASON ENABLE) - if ((NOT DEFINED ${VARIABLE}) # variable not in cache (first run) - OR ((DEFINED ${VARIABLE}_ORIGINAL) AND # variable in cache -> check for change - ((${VARIABLE}_ORIGINAL AND ${VARIABLE}) OR # poor man's boolean equal - (NOT ${VARIABLE}_ORIGINAL AND NOT ${VARIABLE})))) + if ((NOT DEFINED ${VARIABLE}) # variable not in cache (first run) + OR ((DEFINED ${VARIABLE}_AUTODETECTED_VALUE) AND # variable in cache -> different from autodetected value? + ((${VARIABLE}_AUTODETECTED_VALUE AND ${VARIABLE}) OR # poor man's boolean equal + (NOT ${VARIABLE}_AUTODETECTED_VALUE AND NOT ${VARIABLE})))) set(${VARIABLE}_REASON ${REASON}) set(${VARIABLE} ${ENABLE} CACHE BOOL "feature switch" FORCE) else() set(${VARIABLE}_REASON "User defined") endif() - set(${VARIABLE}_ORIGINAL ${ENABLE} CACHE INTERNAL "original value set by build script") + set(${VARIABLE}_AUTODETECTED_VALUE ${ENABLE} CACHE INTERNAL "value autodetected by build script") endmacro() macro(set_with_reason VARIABLE REASON ENABLE) @@ -20,7 +20,7 @@ macro(set_with_reason VARIABLE REASON ENABLE) else() message(WARNING "Do not change user defined settings for ${VARIABLE}") endif() - set(${VARIABLE}_ORIGINAL ${ENABLE} CACHE INTERNAL "original value set by build script") + set(${VARIABLE}_AUTODETECTED_VALUE ${ENABLE} CACHE INTERNAL "value autodetected by build script") endmacro() macro(add_feature FEATURE REASON ENABLE) |