You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-29 08:21:15 +03:00
MCOL-5456 codebase preparation for colab with CS 11.1
This commit is contained in:
committed by
Gagan Goel
parent
74d89e385f
commit
c0c18511f6
1
.gitignore
vendored
1
.gitignore
vendored
@ -177,6 +177,7 @@ build/Testing/
|
|||||||
tests/*\[1\]_tests.cmake
|
tests/*\[1\]_tests.cmake
|
||||||
tests/*\[1\]_include.cmake
|
tests/*\[1\]_include.cmake
|
||||||
.boost
|
.boost
|
||||||
|
build/.cmake
|
||||||
*.vtg
|
*.vtg
|
||||||
*.vtg-back
|
*.vtg-back
|
||||||
'*.vtg-Stashed changes'
|
'*.vtg-Stashed changes'
|
||||||
|
@ -119,6 +119,7 @@ INCLUDE(columnstore_version)
|
|||||||
INCLUDE(misc)
|
INCLUDE(misc)
|
||||||
INCLUDE(boost)
|
INCLUDE(boost)
|
||||||
INCLUDE(thrift)
|
INCLUDE(thrift)
|
||||||
|
INCLUDE(mpark_patterns)
|
||||||
|
|
||||||
FIND_PACKAGE(BISON)
|
FIND_PACKAGE(BISON)
|
||||||
IF (NOT BISON_FOUND)
|
IF (NOT BISON_FOUND)
|
||||||
@ -426,4 +427,4 @@ ELSE ()
|
|||||||
# MariaDB has its own packaging routines
|
# MariaDB has its own packaging routines
|
||||||
INCLUDE(cpackEngineRPM)
|
INCLUDE(cpackEngineRPM)
|
||||||
INCLUDE(cpackEngineDEB)
|
INCLUDE(cpackEngineDEB)
|
||||||
ENDIF ()
|
ENDIF ()
|
24
cmake/mpark_patterns.cmake
Normal file
24
cmake/mpark_patterns.cmake
Normal file
@ -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
|
||||||
|
)
|
@ -15,7 +15,6 @@
|
|||||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||||
MA 02110-1301, USA. */
|
MA 02110-1301, USA. */
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
Reference in New Issue
Block a user