From: maier Date: Thu, 1 Aug 2013 23:40:35 +0000 (+0000) Subject: Merge from Mainline X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=206fa88699d2113e9d0646c4adc18b465a4fae13;p=dealii-svn.git Merge from Mainline git-svn-id: https://svn.dealii.org/branches/branch_port_to_libcxx@30217 0785d39b-7218-0410-832d-ea1e28bc413d --- 206fa88699d2113e9d0646c4adc18b465a4fae13 diff --cc deal.II/cmake/macros/macro_enable_language_optional.cmake index 885b960f8c,885b960f8c..fccb978ae4 --- a/deal.II/cmake/macros/macro_enable_language_optional.cmake +++ b/deal.II/cmake/macros/macro_enable_language_optional.cmake @@@ -32,10 -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,9 +58,17 @@@ ) 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()