Fix warning about cmake version

CMakeLists.txt

@@ -13,6 +13,8 @@
 #   Tobias Leibner  (2016, 2018 - 2020)
 # ~~~
 
+cmake_minimum_required(VERSION 3.8)
+
 project("dune-xt" CXX)
 
 # local environment
@@ -20,9 +22,6 @@ set(ENV{PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../local/bin:$ENV{PATH}")
 set(ENV{LD_LIBRARY_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../local/lib:$ENV{LD_LIBRARY_PATH}")
 set(ENV{PKG_CONFIG_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../local/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")
 
-# cmake specific
-cmake_minimum_required(VERSION 3.8)
-
 set(CMAKE_COLOR_MAKEFILE ON)
 
 # guess dune-common build dir

CONTRIBUTING.md

@@ -95,7 +95,7 @@ public:
   {}
 
 private: // one newline above this group of members
-  double number_; // all provate members with
+  double number_; // all private members with
   bool member_;   // trailing underscore
 }; // two newlines below this class
 

cmake/modules/DuneXtMacros.cmake

@@ -15,6 +15,10 @@
 # enables "IN_LIST operator
 cmake_policy(SET CMP0057 NEW)
 
+# For some reason, the minimum required version is set to 2.8.3 by the find_package(Vc ...) call
+# in DuneCommonMacros.cmake in dune-common. This causes some warnings, so we reset it here.
+cmake_minimum_required(VERSION 3.1)
+
 include(XtCompilerSupport)
 include(XtTooling)
 include(Hints)

cmake/modules/FindMKL.cmake

@@ -15,7 +15,7 @@ include(Hints)
 set(mkl_hints $ENV{MKLROOT} ${MKLROOT} ${root_hints})
 set(mkl_lib_hints "")
 set(mkl_include_hints "")
-list(APPEND mkl_hints "/opt/intel/mkl/" "$ENV{HOME}/intel/mkl/")
+list(APPEND mkl_hints "/opt/intel/mkl/" "$ENV{HOME}/intel/mkl/" "/opt/intel/oneapi/mkl/latest/")
 append_to_each("${mkl_hints}" "/lib/" mkl_lib_hints)
 append_to_each("${mkl_hints}" "/lib/intel64/" mkl_lib_hints_intel)
 list(APPEND mkl_lib_hints ${mkl_lib_hints_intel})

cmake/modules/FindTBB.cmake

@@ -71,10 +71,11 @@ set(tbb_hints $ENV{TBBROOT} ${TBBROOT} ${root_hints})
 set(tbb_lib_hints "")
 set(tbb_include_hints "")
 set(tbb_bin_hints "")
-list(APPEND tbb_hints "/opt/intel/tbb/" "$ENV{HOME}/intel/tbb/")
+list(APPEND tbb_hints "/opt/intel/tbb/" "$ENV{HOME}/intel/tbb/" "/opt/intel/oneapi/tbb/latest/")
 append_to_each("${tbb_hints}" "/lib/" tbb_lib_hints)
 append_to_each("${tbb_hints}" "/lib/intel64/" tbb_lib_hints_intel)
-list(APPEND tbb_lib_hints ${tbb_lib_hints_intel})
+append_to_each("${tbb_hints}" "/lib/intel64/gcc4.8/" tbb_lib_hints_intel_oneapi)
+list(APPEND tbb_lib_hints ${tbb_lib_hints_intel} ${tbb_lib_hints_intel_oneapi})
 append_to_each("${tbb_hints}" "/include/" tbb_include_hints)
 append_to_each("${tbb_hints}" "/bin/" tbb_bin_hints)