Use the CMAKE_CXX_STANDARD variable to turn on cxx11

1 files changed, 51 insertions, 49 deletions

diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt
index cb056690a..76a517c40 100644
--- a/unsupported/test/CMakeLists.txt
+++ b/unsupported/test/CMakeLists.txt
@@ -99,59 +99,61 @@ ei_add_test(kronecker_product)
 if(EIGEN_TEST_CXX11)
   # It should be safe to always run these tests as there is some fallback code for
   # older compiler that don't support cxx11.
-  ei_add_test(cxx11_meta "-std=c++0x")
-  ei_add_test(cxx11_tensor_simple "-std=c++0x")
-#  ei_add_test(cxx11_tensor_symmetry "-std=c++0x")
-  ei_add_test(cxx11_tensor_assign "-std=c++0x")
-  ei_add_test(cxx11_tensor_dimension "-std=c++0x")
-  ei_add_test(cxx11_tensor_index_list "-std=c++0x")
-  ei_add_test(cxx11_tensor_mixed_indices "-std=c++0x")
-  ei_add_test(cxx11_tensor_comparisons "-std=c++0x")
-  ei_add_test(cxx11_tensor_contraction "-std=c++0x")
-  ei_add_test(cxx11_tensor_convolution "-std=c++0x")
-  ei_add_test(cxx11_tensor_expr "-std=c++0x")
-  ei_add_test(cxx11_tensor_math "-std=c++0x")
-  ei_add_test(cxx11_tensor_forced_eval "-std=c++0x")
-  ei_add_test(cxx11_tensor_fixed_size "-std=c++0x")
-  ei_add_test(cxx11_tensor_const "-std=c++0x")
-  ei_add_test(cxx11_tensor_of_const_values "-std=c++0x")
-  ei_add_test(cxx11_tensor_of_complex "-std=c++0x")
-  ei_add_test(cxx11_tensor_of_strings "-std=c++0x")
-  ei_add_test(cxx11_tensor_intdiv "-std=c++0x")
-  ei_add_test(cxx11_tensor_lvalue "-std=c++0x")
-  ei_add_test(cxx11_tensor_map "-std=c++0x")
-  ei_add_test(cxx11_tensor_broadcasting "-std=c++0x")
-  ei_add_test(cxx11_tensor_chipping "-std=c++0x")
-  ei_add_test(cxx11_tensor_concatenation "-std=c++0x")
-  ei_add_test(cxx11_tensor_inflation "-std=c++0x")
-  ei_add_test(cxx11_tensor_morphing "-std=c++0x")
-  ei_add_test(cxx11_tensor_padding "-std=c++0x")
-  ei_add_test(cxx11_tensor_patch "-std=c++0x")
-  ei_add_test(cxx11_tensor_image_patch "-std=c++0x")
-  ei_add_test(cxx11_tensor_volume_patch "-std=c++0x")
-  ei_add_test(cxx11_tensor_reduction "-std=c++0x")
-  ei_add_test(cxx11_tensor_argmax "-std=c++0x")
-  ei_add_test(cxx11_tensor_shuffling "-std=c++0x")
-  ei_add_test(cxx11_tensor_striding "-std=c++0x")
+  set(CMAKE_CXX_STANDARD 11)
+
+  ei_add_test(cxx11_meta)
+  ei_add_test(cxx11_tensor_simple)
+#  ei_add_test(cxx11_tensor_symmetry)
+  ei_add_test(cxx11_tensor_assign)
+  ei_add_test(cxx11_tensor_dimension)
+  ei_add_test(cxx11_tensor_index_list)
+  ei_add_test(cxx11_tensor_mixed_indices)
+  ei_add_test(cxx11_tensor_comparisons)
+  ei_add_test(cxx11_tensor_contraction)
+  ei_add_test(cxx11_tensor_convolution)
+  ei_add_test(cxx11_tensor_expr)
+  ei_add_test(cxx11_tensor_math)
+  ei_add_test(cxx11_tensor_forced_eval)
+  ei_add_test(cxx11_tensor_fixed_size)
+  ei_add_test(cxx11_tensor_const)
+  ei_add_test(cxx11_tensor_of_const_values)
+  ei_add_test(cxx11_tensor_of_complex)
+  ei_add_test(cxx11_tensor_of_strings)
+  ei_add_test(cxx11_tensor_intdiv)
+  ei_add_test(cxx11_tensor_lvalue)
+  ei_add_test(cxx11_tensor_map)
+  ei_add_test(cxx11_tensor_broadcasting)
+  ei_add_test(cxx11_tensor_chipping)
+  ei_add_test(cxx11_tensor_concatenation)
+  ei_add_test(cxx11_tensor_inflation)
+  ei_add_test(cxx11_tensor_morphing)
+  ei_add_test(cxx11_tensor_padding)
+  ei_add_test(cxx11_tensor_patch)
+  ei_add_test(cxx11_tensor_image_patch)
+  ei_add_test(cxx11_tensor_volume_patch)
+  ei_add_test(cxx11_tensor_reduction)
+  ei_add_test(cxx11_tensor_argmax)
+  ei_add_test(cxx11_tensor_shuffling)
+  ei_add_test(cxx11_tensor_striding)
   ei_add_test(cxx11_tensor_thread_pool "-pthread" "${CMAKE_THREAD_LIBS_INIT}")
-  ei_add_test(cxx11_tensor_ref "-std=c++0x")
-  ei_add_test(cxx11_tensor_random "-std=c++0x")
-  ei_add_test(cxx11_tensor_casts "-std=c++0x")
-  ei_add_test(cxx11_tensor_roundings "-std=c++0x")
-  ei_add_test(cxx11_tensor_reverse "-std=c++0x")
-  ei_add_test(cxx11_tensor_layout_swap "-std=c++0x")
-  ei_add_test(cxx11_tensor_io "-std=c++0x")
-  ei_add_test(cxx11_tensor_generator "-std=c++0x")
-  ei_add_test(cxx11_tensor_custom_op "-std=c++0x")
-  ei_add_test(cxx11_tensor_custom_index "-std=c++0x")
-  ei_add_test(cxx11_tensor_sugar "-std=c++0x")
-  ei_add_test(cxx11_tensor_fft "-std=c++0x")
-  ei_add_test(cxx11_tensor_ifft "-std=c++0x")
-  ei_add_test(cxx11_tensor_empty "-std=c++0x")
+  ei_add_test(cxx11_tensor_ref)
+  ei_add_test(cxx11_tensor_random)
+  ei_add_test(cxx11_tensor_casts)
+  ei_add_test(cxx11_tensor_roundings)
+  ei_add_test(cxx11_tensor_reverse)
+  ei_add_test(cxx11_tensor_layout_swap)
+  ei_add_test(cxx11_tensor_io)
+  ei_add_test(cxx11_tensor_generator)
+  ei_add_test(cxx11_tensor_custom_op)
+  ei_add_test(cxx11_tensor_custom_index)
+  ei_add_test(cxx11_tensor_sugar)
+  ei_add_test(cxx11_tensor_fft)
+  ei_add_test(cxx11_tensor_ifft)
+  ei_add_test(cxx11_tensor_empty)
 
   if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
     # This test requires __uint128_t which is only available on 64bit systems 
-    ei_add_test(cxx11_tensor_uint128 "-std=c++0x")
+    ei_add_test(cxx11_tensor_uint128)
   endif() 
 
 endif()