From: Matthias Maier Date: Tue, 29 Nov 2022 00:22:01 +0000 (-0600) Subject: CMake: bundled/* miscellaneous cleanup X-Git-Tag: v9.5.0-rc1~782^2~4 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4ac9033fb0925bfb767620c4ef6d2462a0aa414;p=dealii.git CMake: bundled/* miscellaneous cleanup --- diff --git a/bundled/CMakeLists.txt b/bundled/CMakeLists.txt index 00b96cff67..cc3fe0cef5 100644 --- 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 b5850d4e7b..9dc08a8d53 100644 --- 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 7aca3bc9cb..5a3139bd11 100644 --- 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 91ced155b0..16b273d056 100644 --- 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")