From 0131685b02cca53b054f919377f9dff714d61911 Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 1 Aug 2013 23:39:48 +0000 Subject: [PATCH] Bugfix: Initialize optional languages on subsequent cmake runs, too. git-svn-id: https://svn.dealii.org/trunk@30216 0785d39b-7218-0410-832d-ea1e28bc413d --- .../macros/macro_enable_language_optional.cmake | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/deal.II/cmake/macros/macro_enable_language_optional.cmake b/deal.II/cmake/macros/macro_enable_language_optional.cmake index 885b960f8c..fccb978ae4 100644 --- a/deal.II/cmake/macros/macro_enable_language_optional.cmake +++ b/deal.II/cmake/macros/macro_enable_language_optional.cmake @@ -32,10 +32,10 @@ # MACRO(ENABLE_LANGUAGE_OPTIONAL _language) - # - # Run this check exactly once: - # IF(NOT ${_language}_CHECKED) + # + # Run this check exactly once: + # SET(${_language}_CHECKED TRUE CACHE INTERNAL "" FORCE) SET(_tmp ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/${_language}_test) @@ -58,9 +58,17 @@ MACRO(ENABLE_LANGUAGE_OPTIONAL _language) ) IF("${_result}" STREQUAL "0") + SET(DEAL_II_${_language}_COMPILER_WORKS TRUE CACHE INTERNAL "" FORCE) ENABLE_LANGUAGE(${_language}) ELSE() MESSAGE(STATUS "No working ${_language} compiler found, disabling ${_language}") ENDIF() + ELSE() + # + # Enable the language depending on the cached result from a former run: + # + IF(DEAL_II_${_language}_COMPILER_WORKS) + ENABLE_LANGUAGE(${_language}) + ENDIF() ENDIF() ENDMACRO() -- 2.39.5