Skip to content

Commit 176eefc

Browse files
drrtuytntnatbry
authored andcommitted
MCOL-5456 codebase preparation for colab with CS 11.1
1 parent 0be1c3d commit 176eefc

File tree

4 files changed

+27
-2
lines changed

4 files changed

+27
-2
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ build/Testing/
177177
tests/*\[1\]_tests.cmake
178178
tests/*\[1\]_include.cmake
179179
.boost
180+
build/.cmake
180181
*.vtg
181182
*.vtg-back
182183
'*.vtg-Stashed changes'

CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ INCLUDE(columnstore_version)
119119
INCLUDE(misc)
120120
INCLUDE(boost)
121121
INCLUDE(thrift)
122+
INCLUDE(mpark_patterns)
122123

123124
FIND_PACKAGE(BISON)
124125
IF (NOT BISON_FOUND)
@@ -426,4 +427,4 @@ ELSE ()
426427
# MariaDB has its own packaging routines
427428
INCLUDE(cpackEngineRPM)
428429
INCLUDE(cpackEngineDEB)
429-
ENDIF ()
430+
ENDIF ()

cmake/mpark_patterns.cmake

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
include(ExternalProject)
2+
3+
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
4+
set(_toolset "gcc")
5+
elseif(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
6+
set(_toolset "clang")
7+
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
8+
set(_toolset "intel-linux")
9+
endif()
10+
11+
# set(INSTALL_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/.boost/boost-lib)
12+
# SET(Boost_INCLUDE_DIRS "${INSTALL_LOCATION}/include")
13+
# SET(Boost_LIBRARY_DIRS "${INSTALL_LOCATION}/lib")
14+
# LINK_DIRECTORIES("${Boost_LIBRARY_DIRS}")
15+
16+
ExternalProject_Add(mpark_patterns
17+
PREFIX external/patternes
18+
URL https://github.com/mpark/patterns/archive/refs/tags/v0.3.0.tar.gz
19+
URL_HASH SHA256=80e6af808a4d74d5d7358666303eb1dbfc5582313ff9fa31d1c0d3280d3bd9e7
20+
BUILD_IN_SOURCE TRUE
21+
LOG_BUILD TRUE
22+
LOG_INSTALL TRUE
23+
EXCLUDE_FROM_ALL TRUE
24+
)

utils/messageqcpp/messagequeuepool.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
1616
MA 02110-1301, USA. */
1717

18-
#include <memory>
1918
#include <sstream>
2019
#include <map>
2120
#include <time.h>

0 commit comments

Comments
 (0)