From: Matthias Maier Date: Wed, 1 Oct 2014 13:08:18 +0000 (+0200) Subject: CMake: Remove test DEAL_II_HAVE_CXX11_ICCBOOSTSIGNALSBUG_OK X-Git-Tag: v8.2.0-rc1~115^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c6e490d67745c2c11a3c4a3af20901291af17a7;p=dealii.git CMake: Remove test DEAL_II_HAVE_CXX11_ICCBOOSTSIGNALSBUG_OK We cannot sanely test for this regression prior to boost setup. And after boost setup it is incredibly ugly to do so because DEAL_II_WITH_STDCXX11 is already processed. --- diff --git a/cmake/checks/check_01_cxx_features.cmake b/cmake/checks/check_01_cxx_features.cmake index 8bac8a656e..bc428093d8 100644 --- a/cmake/checks/check_01_cxx_features.cmake +++ b/cmake/checks/check_01_cxx_features.cmake @@ -213,50 +213,6 @@ IF(NOT DEFINED DEAL_II_WITH_CXX11 OR DEAL_II_WITH_CXX11) DEAL_II_HAVE_CXX11_ICCLIBSTDCPP47CXX11BUG_OK) - # - # icc does not play nicely with boost::signals2 and -std=c++11. - # Disable C++11 support in this case. - # - # [1] https://software.intel.com/en-us/forums/topic/515966 - # - # - Matthias Maier, 2014 - # - - # - # Use bundled boost headers for this regression test because external - # features (such as boost) are not yet configured at this point. If we - # have no bundled directory available, skip the test. - # - IF(DEAL_II_HAVE_BUNDLED_DIRECTORY) - CHECK_CXX_SOURCE_COMPILES( - " - #include <${BOOST_FOLDER}/include/boost/signals2/signal.hpp> - using namespace boost::signals2; - - class Order {}; - - class Foo - { - signal beforeOrder; - void test(Order* o) - { - beforeOrder(o); - } - }; - - int main() - { - Order o; - Foo foo; - return 0; - } - " - DEAL_II_HAVE_CXX11_ICCBOOSTSIGNALSBUG_OK) - ELSE() - SET(DEAL_II_HAVE_CXX11_ICCBOOSTSIGNALSBUG_OK TRUE) - ENDIF() - - IF( DEAL_II_HAVE_CXX11_ARRAY AND DEAL_II_HAVE_CXX11_CONDITION_VARIABLE AND DEAL_II_HAVE_CXX11_FUNCTIONAL AND @@ -268,8 +224,7 @@ IF(NOT DEFINED DEAL_II_WITH_CXX11 OR DEAL_II_WITH_CXX11) DEAL_II_HAVE_CXX11_TYPE_TRAITS AND DEAL_II_HAVE_CXX11_MACOSXC99BUG_OK AND DEAL_II_HAVE_CXX11_ICCNUMERICLIMITSBUG_OK AND - DEAL_II_HAVE_CXX11_ICCLIBSTDCPP47CXX11BUG_OK AND - DEAL_II_HAVE_CXX11_ICCBOOSTSIGNALSBUG_OK) + DEAL_II_HAVE_CXX11_ICCLIBSTDCPP47CXX11BUG_OK ) SET(DEAL_II_HAVE_CXX11 TRUE) ENDIF()