diff --git a/.gitignore b/.gitignore index 1661c661a..911a86071 100644 --- a/.gitignore +++ b/.gitignore @@ -177,6 +177,7 @@ build/Testing/ tests/*\[1\]_tests.cmake tests/*\[1\]_include.cmake .boost +build/.cmake *.vtg *.vtg-back '*.vtg-Stashed changes' diff --git a/CMakeLists.txt b/CMakeLists.txt index e9da392e3..f9fab5f37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,6 +119,7 @@ INCLUDE(columnstore_version) INCLUDE(misc) INCLUDE(boost) INCLUDE(thrift) +INCLUDE(mpark_patterns) FIND_PACKAGE(BISON) IF (NOT BISON_FOUND) @@ -426,4 +427,4 @@ ELSE () # MariaDB has its own packaging routines INCLUDE(cpackEngineRPM) INCLUDE(cpackEngineDEB) -ENDIF () +ENDIF () \ No newline at end of file diff --git a/cmake/mpark_patterns.cmake b/cmake/mpark_patterns.cmake new file mode 100644 index 000000000..462654d89 --- /dev/null +++ b/cmake/mpark_patterns.cmake @@ -0,0 +1,24 @@ +include(ExternalProject) + +if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") + set(_toolset "gcc") +elseif(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang") + set(_toolset "clang") +elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel") + set(_toolset "intel-linux") +endif() + +# set(INSTALL_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/.boost/boost-lib) +# SET(Boost_INCLUDE_DIRS "${INSTALL_LOCATION}/include") +# SET(Boost_LIBRARY_DIRS "${INSTALL_LOCATION}/lib") +# LINK_DIRECTORIES("${Boost_LIBRARY_DIRS}") + +ExternalProject_Add(mpark_patterns + PREFIX external/patternes + URL https://github.com/mpark/patterns/archive/refs/tags/v0.3.0.tar.gz + URL_HASH SHA256=80e6af808a4d74d5d7358666303eb1dbfc5582313ff9fa31d1c0d3280d3bd9e7 + BUILD_IN_SOURCE TRUE + LOG_BUILD TRUE + LOG_INSTALL TRUE + EXCLUDE_FROM_ALL TRUE +) diff --git a/utils/messageqcpp/messagequeuepool.cpp b/utils/messageqcpp/messagequeuepool.cpp index bdd812d80..ce9d98534 100644 --- a/utils/messageqcpp/messagequeuepool.cpp +++ b/utils/messageqcpp/messagequeuepool.cpp @@ -15,7 +15,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include #include #include