diff options
| author | Pierre Grandin <grandinp@altern.org> | 2016-12-01 19:23:13 +0000 |
|---|---|---|
| committer | Pierre Grandin <grandinp@altern.org> | 2016-12-01 19:23:13 +0000 |
| commit | 5030d911084584f9b37aeaa916ab43130044edbf (patch) | |
| tree | 0f0e400aa2c575c3fcdfcceaa6012d2f760e525e /cmake/navit_macros.cmake | |
| parent | 449e5530c4ee68f77691c811f0670cf90e9e58a4 (diff) | |
| parent | 59bbe485ba74a6df5ec944275ae28fc1bd98981e (diff) | |
| download | navit-trac/1341.tar.gz | |
Merge branch 'trunk' into trac/1341trac/1341
Conflicts:
navit/Makefile.am
navit/xpm/Makefile.am
po/Makefile.am
Diffstat (limited to 'cmake/navit_macros.cmake')
| -rw-r--r-- | cmake/navit_macros.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/navit_macros.cmake b/cmake/navit_macros.cmake index d1b4359fb..3baf5c9ed 100644 --- a/cmake/navit_macros.cmake +++ b/cmake/navit_macros.cmake @@ -15,9 +15,9 @@ 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}_REASON ${REASON}) - string(REPLACE "/" "_" VARIABLE_NAMES ${VARIABLE}) - set(${VARIABLE_NAMES}_LIBS ${ARGN}) endif() + string(REPLACE "/" "_" VARIABLE_NAMES ${VARIABLE}) + set(${VARIABLE_NAMES}_LIBS ${ARGN}) set(${VARIABLE}_AUTODETECTED_VALUE ${ENABLE} CACHE INTERNAL "value autodetected by build script") endmacro() |