]> https://gitweb.dealii.org/ - dealii.git/commitdiff
CMake: Remove test DEAL_II_HAVE_CXX11_ICCBOOSTSIGNALSBUG_OK
authorMatthias Maier <matthias.maier@iwr.uni-heidelberg.de>
Wed, 1 Oct 2014 13:08:18 +0000 (15:08 +0200)
committerMatthias Maier <matthias.maier@iwr.uni-heidelberg.de>
Wed, 1 Oct 2014 13:08:18 +0000 (15:08 +0200)
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.

cmake/checks/check_01_cxx_features.cmake

index 8bac8a656e7752d54082e6c01dc4a348dc20363a..bc428093d8f9f842ee69d083c0bbc9b58278bc83 100644 (file)
@@ -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<void(Order*)> 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()
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.