1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2026-01-06 08:21:10 +03:00

Merge pull request #960 from LinuxJedi/unified_build

Unified build for ES and MCS
This commit is contained in:
benthompson15
2019-12-05 01:19:23 +01:00
committed by GitHub
133 changed files with 529 additions and 910 deletions

View File

@@ -4,7 +4,7 @@ include_directories(${ENGINE_COMMON_INCLUDES} ../dictionary)
add_executable(we_shared_components_tests ./shared_components_tests.cpp)
target_link_libraries(we_shared_components_tests ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${CPPUNIT_LIBRARIES})
install(TARGETS we_shared_components_tests DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS we_shared_components_tests DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
########### install files ###############

View File

@@ -27,7 +27,7 @@
#ifdef _MSC_VER
#include <cstdio>
#endif
#include "config.h"
#include "mcsconfig.h"
#include "we_convertor.h"

View File

@@ -17,7 +17,7 @@
// $Id: we_fileop.cpp 4737 2013-08-14 20:45:46Z bwilkinson $
#include "config.h"
#include "mcsconfig.h"
#include <unistd.h>
#include <stdio.h>
#include <string.h>