From a85a552cda62eb3ba025b972fc9af12d9313809a Mon Sep 17 00:00:00 2001 From: sleske Date: Fri, 14 Jun 2013 18:49:50 +0000 Subject: Fix:build/cmake:Remember user settings (-Dxxx=xxx) across CMake runs. git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5534 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- cmake/navit_macros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake') diff --git a/cmake/navit_macros.cmake b/cmake/navit_macros.cmake index 3f8139944..cb64f37b8 100644 --- a/cmake/navit_macros.cmake +++ b/cmake/navit_macros.cmake @@ -14,13 +14,13 @@ endmacro() macro(set_with_reason VARIABLE REASON ENABLE) if (DEFINED ${VARIABLE}_REASON AND NOT ${VARIABLE}_REASON STREQUAL "User defined") set(${VARIABLE} ${ENABLE} CACHE BOOL "feature switch" FORCE) - set(${VARIABLE}_ORIGINAL ${ENABLE} CACHE INTERNAL "original value set by build script") set(${VARIABLE}_REASON ${REASON}) string(REPLACE "/" "_" VARIABLE_NAMES ${VARIABLE}) set(${VARIABLE_NAMES}_LIBS ${ARGN}) else() message(WARNING "Do not change user defined settings for ${VARIABLE}") endif() + set(${VARIABLE}_ORIGINAL ${ENABLE} CACHE INTERNAL "original value set by build script") endmacro() macro(add_feature FEATURE REASON ENABLE) -- cgit v1.2.1