CMake: bundled/* miscellaneous cleanup

diff --git a/bundled/CMakeLists.txt b/bundled/CMakeLists.txt
index 00b96cff67f05e5ea32e497c257a9e9cb480eb5e..cc3fe0cef5bf8d5acba4346fe3e657f52bbf87f8 100644 (file)
--- a/bundled/CMakeLists.txt
+++ b/bundled/CMakeLists.txt
@@ -21,14 +21,14 @@ message(STATUS "Setting up bundled features")
 
 
 if(FEATURE_BOOST_BUNDLED_CONFIGURED)
+  add_subdirectory(${BOOST_FOLDER}/libs/serialization/src)
+  add_subdirectory(${BOOST_FOLDER}/libs/system/src)
+
   install(DIRECTORY ${BOOST_FOLDER}/include/boost
     DESTINATION ${DEAL_II_INCLUDE_RELDIR}/deal.II/bundled
     COMPONENT library
     )
 
-  add_subdirectory(${BOOST_FOLDER}/libs/serialization/src)
-  add_subdirectory(${BOOST_FOLDER}/libs/system/src)
-
   if(DEAL_II_WITH_ZLIB)
     add_subdirectory(${BOOST_FOLDER}/libs/iostreams/src)
   else()
@@ -56,13 +56,13 @@ endif()
 
 
 if(FEATURE_TBB_BUNDLED_CONFIGURED)
+  add_subdirectory(${TBB_FOLDER}/src)
+
   install(DIRECTORY ${TBB_FOLDER}/include/tbb
     DESTINATION ${DEAL_II_INCLUDE_RELDIR}/deal.II/bundled
     COMPONENT library
     FILES_MATCHING PATTERN "*.h"
     )
-
-  add_subdirectory(${TBB_FOLDER}/src)
 endif()
 
 
@@ -85,5 +85,4 @@ if(FEATURE_MUPARSER_BUNDLED_CONFIGURED)
 endif()
 
 
-
 message(STATUS "Setting up bundled features - Done")

diff --git a/bundled/boost-1.70.0/libs/iostreams/src/CMakeLists.txt b/bundled/boost-1.70.0/libs/iostreams/src/CMakeLists.txt
index b5850d4e7bdecc3ef54e0afbf0f19236ee96fb69..9dc08a8d5336d19eb3c9995f7b1b769bcbc8be30 100644 (file)
--- a/bundled/boost-1.70.0/libs/iostreams/src/CMakeLists.txt
+++ b/bundled/boost-1.70.0/libs/iostreams/src/CMakeLists.txt
@@ -25,8 +25,8 @@ set(src_boost_iostreams
     mapped_file.cpp
     zlib.cpp
     )
-
-enable_if_supported(DEAL_II_CXX_FLAGS -Wno-deprecated-copy)
 enable_if_supported(DEAL_II_CXX_FLAGS -Wno-c11-extensions)
+enable_if_supported(DEAL_II_CXX_FLAGS -Wno-deprecated-copy)
+enable_if_supported(DEAL_II_CXX_FLAGS -Wno-uninitialized)
 
 deal_ii_add_library(obj_boost_iostreams OBJECT ${src_boost_iostreams})

diff --git a/bundled/muparser_v2_3_3/CMakeLists.txt b/bundled/muparser_v2_3_3/CMakeLists.txt
index 7aca3bc9cb05b0343e8db92530e860010a6969a8..5a3139bd111f0fa1d34185282fdcbcd377bfaebd 100644 (file)
--- a/bundled/muparser_v2_3_3/CMakeLists.txt
+++ b/bundled/muparser_v2_3_3/CMakeLists.txt
@@ -29,12 +29,12 @@ include_directories(
 )
 
 deal_ii_add_library(obj_muparser OBJECT
-src/muParserBase.cpp
-src/muParserBytecode.cpp
-src/muParserCallback.cpp
-src/muParser.cpp
-src/muParserError.cpp
-src/muParserInt.cpp
-src/muParserTest.cpp
-src/muParserTokenReader.cpp
+  src/muParserBase.cpp
+  src/muParserBytecode.cpp
+  src/muParserCallback.cpp
+  src/muParser.cpp
+  src/muParserError.cpp
+  src/muParserInt.cpp
+  src/muParserTest.cpp
+  src/muParserTokenReader.cpp
   )

diff --git a/bundled/tbb-2018_U2/src/CMakeLists.txt b/bundled/tbb-2018_U2/src/CMakeLists.txt
index 91ced155b07eb47091d9502d023be88aed6fcca1..16b273d056fe647630f8889ad27d8128df29547e 100644 (file)
--- a/bundled/tbb-2018_U2/src/CMakeLists.txt
+++ b/bundled/tbb-2018_U2/src/CMakeLists.txt
@@ -36,10 +36,10 @@ enable_if_supported(DEAL_II_CXX_FLAGS "-flifetime-dse=1")
 #
 # Disable other warnings:
 #
-enable_if_supported(DEAL_II_CXX_FLAGS "-Wimplicit-fallthrough=0")
-enable_if_supported(DEAL_II_CXX_FLAGS "-Wstringop-overflow=0")
+enable_if_supported(DEAL_II_CXX_FLAGS "-Wno-implicit-fallthrough")
+enable_if_supported(DEAL_II_CXX_FLAGS "-Wno-stringop-overflow")
 enable_if_supported(DEAL_II_CXX_FLAGS "-Wno-deprecated-copy")
-enable_if_supported(DEAL_II_CXX_FLAGS "-Wtautological-overlap-compare=0")
+enable_if_supported(DEAL_II_CXX_FLAGS "-Wno-tautological-overlap-compare")