From 7489d0bfd02a53c0435ff564767a20f0eebfca4b Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Wed, 27 Nov 2019 08:21:58 +0000 Subject: [PATCH] MCOL-3625 Rename packages Rename packages to MariaDB-columnstore-engine, MariaDB-columnstore-libs and MariaDB-columnstore-platform. Also add the "columnstore-" prefix the the components so that MariaDB's packaging system understands then and add a line to include them in MariaDB's packaging. In addition * Fix S3 building for dist source build * Fix Debian 10 dependency issue * Fix git handling for dist builds * Add support for MariaDB's RPM building * Use MariaDB's PCRE and readline * Removes a few dead files * Fix Boost noncopyable includes --- CMakeLists.txt | 208 ++++++++++-------- cmake/columnstore_version.cmake | 36 +-- cmake/cpackEngineDEB.cmake | 18 +- cmake/cpackEngineRPM.cmake | 18 +- columnstoreversion.h.in | 2 +- dbcon/ddlpackage/CMakeLists.txt | 4 +- dbcon/ddlpackageproc/CMakeLists.txt | 4 +- dbcon/dmlpackage/CMakeLists.txt | 4 +- dbcon/dmlpackageproc/CMakeLists.txt | 4 +- dbcon/execplan/CMakeLists.txt | 4 +- dbcon/joblist/CMakeLists.txt | 6 +- dbcon/joblist/expressionstep.cpp | 2 +- dbcon/joblist/groupconcat.cpp | 2 +- dbcon/joblist/jlf_tuplejoblist.cpp | 18 +- dbcon/joblist/joblistfactory.cpp | 10 +- dbcon/joblist/windowfunctionstep.cpp | 4 +- dbcon/mysql/CMakeLists.txt | 12 +- ddlproc/CMakeLists.txt | 2 +- dmlproc/CMakeLists.txt | 2 +- exemgr/CMakeLists.txt | 2 +- oam/cloud/CMakeLists.txt | 2 +- oam/etc/CMakeLists.txt | 2 +- oam/install_scripts/CMakeLists.txt | 6 +- oam/oamcpp/CMakeLists.txt | 4 +- oam/post/CMakeLists.txt | 2 +- oamapps/alarmmanager/CMakeLists.txt | 4 +- oamapps/columnstoreDB/CMakeLists.txt | 2 +- oamapps/columnstoreSupport/CMakeLists.txt | 6 +- .../columnstoreSupport/columnstoreSupport.cpp | 2 +- oamapps/mcsadmin/CMakeLists.txt | 4 +- oamapps/mcsadmin/mcsadmin.h | 4 +- oamapps/postConfigure/CMakeLists.txt | 22 +- oamapps/postConfigure/helpers.cpp | 2 +- oamapps/postConfigure/postConfigure.cpp | 4 +- oamapps/serverMonitor/CMakeLists.txt | 2 +- primitives/primproc/CMakeLists.txt | 2 +- procmgr/CMakeLists.txt | 2 +- procmon/CMakeLists.txt | 2 +- storage-manager/CMakeLists.txt | 8 +- storage-manager/src/Ownership.h | 1 + storage-manager/src/ThreadPool.h | 1 + tools/clearShm/CMakeLists.txt | 2 +- tools/cleartablelock/CMakeLists.txt | 2 +- tools/configMgt/CMakeLists.txt | 2 +- tools/configMgt/configure.cpp | 4 +- tools/cplogger/CMakeLists.txt | 2 +- tools/dbbuilder/CMakeLists.txt | 2 +- tools/dbloadxml/CMakeLists.txt | 2 +- tools/ddlcleanup/CMakeLists.txt | 2 +- tools/editem/CMakeLists.txt | 2 +- tools/getConfig/CMakeLists.txt | 2 +- tools/idbmeminfo/CMakeLists.txt | 2 +- tools/setConfig/CMakeLists.txt | 4 +- tools/viewtablelock/CMakeLists.txt | 2 +- utils/batchloader/CMakeLists.txt | 4 +- utils/cacheutils/CMakeLists.txt | 4 +- utils/cloudio/CMakeLists.txt | 4 +- utils/clusterTester/CMakeLists.txt | 4 +- utils/common/CMakeLists.txt | 5 +- utils/compress/CMakeLists.txt | 4 +- utils/configcpp/CMakeLists.txt | 4 +- utils/dataconvert/CMakeLists.txt | 4 +- utils/ddlcleanup/CMakeLists.txt | 4 +- utils/funcexp/CMakeLists.txt | 4 +- utils/idbdatafile/CMakeLists.txt | 4 +- utils/joiner/CMakeLists.txt | 4 +- utils/libmarias3/CMakeLists.txt | 8 +- utils/libmysql_client/CMakeLists.txt | 4 +- utils/loggingcpp/CMakeLists.txt | 6 +- utils/messageqcpp/CMakeLists.txt | 4 +- utils/querystats/CMakeLists.txt | 4 +- utils/querytele/CMakeLists.txt | 4 +- utils/regr/CMakeLists.txt | 8 +- utils/rowgroup/CMakeLists.txt | 4 +- utils/rwlock/CMakeLists.txt | 4 +- utils/threadpool/CMakeLists.txt | 4 +- utils/thrift/CMakeLists.txt | 4 +- utils/udfsdk/CMakeLists.txt | 8 +- utils/windowfunction/CMakeLists.txt | 6 +- versioning/BRM/CMakeLists.txt | 18 +- writeengine/bulk/CMakeLists.txt | 2 +- writeengine/client/CMakeLists.txt | 4 +- writeengine/redistribute/CMakeLists.txt | 4 +- writeengine/server/CMakeLists.txt | 2 +- writeengine/shared/CMakeLists.txt | 2 +- writeengine/splitter/CMakeLists.txt | 2 +- writeengine/wrapper/CMakeLists.txt | 4 +- 87 files changed, 294 insertions(+), 337 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be77d6c99..3211cd5fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,17 +35,14 @@ else() set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) endif(CCACHE_FOUND) endif() -# Distinguish between community and non-community builds, with the -# default being a community build. This does not impact the feature -# set that will be compiled in; it's merely provided as a hint to -# custom packaging steps. -OPTION(COMMUNITY_BUILD "Set to true if this is a community build" ON) -IF(NOT CMAKE_BUILD_TYPE) - SET(CMAKE_BUILD_TYPE RELWITHDEBINFO CACHE STRING - "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel" FORCE) -ENDIF(NOT CMAKE_BUILD_TYPE) -SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") +IF(NOT INSTALL_LAYOUT) + IF(NOT CMAKE_BUILD_TYPE) + SET(CMAKE_BUILD_TYPE RELWITHDEBINFO CACHE STRING + "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel" FORCE) + ENDIF(NOT CMAKE_BUILD_TYPE) + SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") +ENDIF() if(SERVER_BUILD_DIR) if (NOT IS_ABSOLUTE ${SERVER_BUILD_DIR}) @@ -77,18 +74,18 @@ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib) SET (ENGINE_SYSCONFDIR "/etc") SET (ENGINE_DATADIR "/var/lib/columnstore") -IF (RPM) +IF (INSTALL_LAYOUT) # We are building from MariaDB server submodule if this is set - if (INSTALL_LAYOUT) - SET(MARIADB_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR_RPM}") - SET(MARIADB_MYCNFDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_SYSCONF2DIR_RPM}") - SET(ENGINE_LIBDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBDIR_RPM}") - SET(ENGINE_BINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR_RPM}") - SET(ENGINE_INCDIR "${CMAKE_INSTALL_PREFIX}/include") - SET(ENGINE_MANDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_MANDIR_RPM}") - SET(ENGINE_SBINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_SBINDIR_RPM}") - SET(ENGINE_SUPPORTDIR "${CMAKE_INSTALL_PREFIX}/share/columnstore") - else () + SET(MARIADB_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}") + SET(MARIADB_MYCNFDIR "${INSTALL_SYSCONF2DIR}") + SET(ENGINE_LIBDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBDIR}") + SET(ENGINE_BINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}") + SET(ENGINE_INCDIR "${CMAKE_INSTALL_PREFIX}/include") + SET(ENGINE_MANDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_MANDIR}") + SET(ENGINE_SBINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_SBINDIR}") + SET(ENGINE_SUPPORTDIR "${CMAKE_INSTALL_PREFIX}/share/columnstore") +ELSE () + IF (RPM) SET(MARIADB_PLUGINDIR "/usr/lib64/mysql/plugin") SET(MARIADB_MYCNFDIR "/etc/my.cnf.d") SET (ENGINE_LIBDIR "/usr/lib64") @@ -97,18 +94,7 @@ IF (RPM) SET (ENGINE_MANDIR "/usr/share/man") SET (ENGINE_SBINDIR "/usr/sbin") SET (ENGINE_SUPPORTDIR "/usr/share/columnstore") - endif () -ELSEIF (DEB) - if (INSTALL_LAYOUT) - SET(MARIADB_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR_DEB}") - SET(MARIADB_MYCNFDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_SYSCONF2DIR_DEB}") - SET(ENGINE_LIBDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBDIR_DEB}") - SET(ENGINE_BINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR_DEB}") - SET(ENGINE_INCDIR "${CMAKE_INSTALL_PREFIX}/include") - SET(ENGINE_MANDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_MANDIR_DEB}") - SET(ENGINE_SBINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_SBINDIR_DEB}") - SET(ENGINE_SUPPORTDIR "${CMAKE_INSTALL_PREFIX}/share/columnstore") - else () + ELSEIF (DEB) SET(MARIADB_PLUGINDIR "/usr/lib/mysql/plugin") SET(MARIADB_MYCNFDIR "/etc/mysql/conf.d") SET (ENGINE_LIBDIR "/usr/lib") @@ -117,18 +103,7 @@ ELSEIF (DEB) SET (ENGINE_MANDIR "/usr/share/man") SET (ENGINE_SBINDIR "/usr/sbin") SET (ENGINE_SUPPORTDIR "/usr/share/columnstore") - endif () -ELSE() - if (INSTALL_LAYOUT) - SET(MARIADB_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR_STANDALONE}") - SET(MARIADB_MYCNFDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_SYSCONF2DIR_STANDALONE}") - SET(ENGINE_LIBDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBDIR_STANDALONE}") - SET(ENGINE_BINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR_STANDALONE}") - SET(ENGINE_INCDIR "${CMAKE_INSTALL_PREFIX}/include") - SET(ENGINE_MANDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_MANDIR_STANDALONE}") - SET(ENGINE_SBINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_SBINDIR_STANDALONE}") - SET(ENGINE_SUPPORTDIR "${CMAKE_INSTALL_PREFIX}/share/columnstore") - else () + ELSE () # TODO: prefix should probably apply here SET(MARIADB_PLUGINDIR "/usr/local/lib/mysql/plugin") SET(MARIADB_MYCNFDIR "/etc/mysql") @@ -138,18 +113,20 @@ ELSE() SET (ENGINE_MANDIR "/usr/local/man") SET (ENGINE_SBINDIR "/usr/local/sbin") SET (ENGINE_SUPPORTDIR "/usr/local/share/columnstore") - endif () -ENDIF() + ENDIF () +ENDIF () SET_PROPERTY(DIRECTORY PROPERTY EP_BASE ${CMAKE_CURRENT_BINARY_DIR}/external) LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) -FIND_PACKAGE(Boost 1.53.0 REQUIRED COMPONENTS system filesystem thread regex date_time) +FIND_PACKAGE(Boost 1.53.0 REQUIRED COMPONENTS system filesystem thread regex date_time chrono) FIND_PACKAGE(BISON REQUIRED) check_cxx_source_compiles("#include \n void main(){}" HAS_STD_FILESYSTEM) check_cxx_source_compiles("#include \n void main(){}" HAS_STD_EXPERIMENTAL_FILESYSTEM) +SET (ENGINE_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + INCLUDE(columnstore_version) SET (PACKAGE columnstore) @@ -160,9 +137,6 @@ SET (PACKAGE_URL "") SET (PACKAGE_STRING columnstore-${PACKAGE_VERSION}) - -SET (ENGINE_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - INCLUDE (configureEngine) @@ -191,36 +165,40 @@ if(NOT AWK_EXECUTABLE) message(FATAL_ERROR "awk not found!") endif() -INCLUDE(check_compiler_flag) +IF (NOT INSTALL_LAYOUT) + INCLUDE(check_compiler_flag) -MY_CHECK_AND_SET_COMPILER_FLAG("-g -O3 -std=c++11 -fno-omit-frame-pointer -fno-strict-aliasing -Wall -fno-tree-vectorize -D_GLIBCXX_ASSERTIONS -DDBUG_OFF -DHAVE_CONFIG_H" RELEASE RELWITHDEBINFO MINSIZEREL) -MY_CHECK_AND_SET_COMPILER_FLAG("-ggdb3 -std=c++11 -fno-omit-frame-pointer -fno-tree-vectorize -D_GLIBCXX_ASSERTIONS -DSAFE_MUTEX -DSAFEMALLOC -DENABLED_DEBUG_SYNC -O0 -Wall -D_DEBUG -DHAVE_CONFIG_H" DEBUG) + MY_CHECK_AND_SET_COMPILER_FLAG("-g -O3 -std=c++11 -fno-omit-frame-pointer -fno-strict-aliasing -Wall -fno-tree-vectorize -D_GLIBCXX_ASSERTIONS -DDBUG_OFF -DHAVE_CONFIG_H" RELEASE RELWITHDEBINFO MINSIZEREL) + MY_CHECK_AND_SET_COMPILER_FLAG("-ggdb3 -std=c++11 -fno-omit-frame-pointer -fno-tree-vectorize -D_GLIBCXX_ASSERTIONS -DSAFE_MUTEX -DSAFEMALLOC -DENABLED_DEBUG_SYNC -O0 -Wall -D_DEBUG -DHAVE_CONFIG_H" DEBUG) -# enable security hardening features, like most distributions do -# in our benchmarks that costs about ~1% of performance, depending on the load -IF(CMAKE_C_COMPILER_VERSION VERSION_LESS "4.6") - SET(security_default OFF) -ELSE() - SET(security_default ON) + # enable security hardening features, like most distributions do + # in our benchmarks that costs about ~1% of performance, depending on the load + IF(CMAKE_C_COMPILER_VERSION VERSION_LESS "4.6") + SET(security_default OFF) + ELSE() + SET(security_default ON) + ENDIF() + OPTION(SECURITY_HARDENED "Use security-enhancing compiler features (stack protector, relro, etc)" ${security_default}) + OPTION(SECURITY_HARDENED_NEW "Use new security-enhancing compilier features" OFF) + IF(SECURITY_HARDENED) + # security-enhancing flags + MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC") + MY_CHECK_AND_SET_COMPILER_FLAG("-Wl,-z,relro,-z,now") + MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector --param=ssp-buffer-size=4") + MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO) + MY_CHECK_AND_SET_COMPILER_FLAG("-fexceptions") + IF(SECURITY_HARDENED_NEW) + MY_CHECK_AND_SET_COMPILER_FLAG("-mcet -fcf-protection") + MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector-strong") + MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-clash-protection") + ENDIF() + ENDIF() +ELSE () + # Remove visibility flag for now as it breaks Ubuntu 18.05 and we need to + # fix our libraries anyway + STRING(REPLACE "-fvisibility=hidden" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) ENDIF() -OPTION(SECURITY_HARDENED "Use security-enhancing compiler features (stack protector, relro, etc)" ${security_default}) -OPTION(SECURITY_HARDENED_NEW "Use new security-enhancing compilier features" OFF) -IF(SECURITY_HARDENED) - # security-enhancing flags - MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC") - MY_CHECK_AND_SET_COMPILER_FLAG("-Wl,-z,relro,-z,now") - MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector --param=ssp-buffer-size=4") - MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO) - MY_CHECK_AND_SET_COMPILER_FLAG("-fexceptions") - IF(SECURITY_HARDENED_NEW) - MY_CHECK_AND_SET_COMPILER_FLAG("-mcet -fcf-protection") - MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector-strong") - MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-clash-protection") - ENDIF() -ENDIF() - SET (ENGINE_LDFLAGS "-Wl,--no-as-needed -Wl,--add-needed") - SET (ENGINE_COMMON_LIBS messageqcpp loggingcpp configcpp idbboot ${Boost_LIBRARIES} xml2 pthread rt libmysql_client) SET (ENGINE_OAM_LIBS oamcpp alarmmanager) SET (ENGINE_BRM_LIBS brm idbdatafile cacheutils rwlock ${ENGINE_OAM_LIBS} ${ENGINE_COMMON_LIBS}) @@ -301,12 +279,24 @@ SET (ENGINE_UTILS_LIBMYSQL_CL_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/utils/libmysq SET (ENGINE_WE_CONFIGCPP_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/writeengine/xml") SET (ENGINE_SERVER_SQL_INCLUDE "${SERVER_SOURCE_ROOT_DIR}/sql") SET (ENGINE_SERVER_INCLUDE_INCLUDE "${SERVER_SOURCE_ROOT_DIR}/include") -SET (ENGINE_SERVER_PCRE_INCLUDE "${SERVER_BUILD_INCLUDE_DIR}/../pcre") +IF (PCRE_INCLUDES) + SET (ENGINE_SERVER_PCRE_INCLUDE "${PCRE_INCLUDES}") +ELSE () + SET (ENGINE_SERVER_PCRE_INCLUDE "${SERVER_BUILD_INCLUDE_DIR}/../pcre") +ENDIF () SET (ENGINE_SERVER_WSREP_INCLUDE "${SERVER_SOURCE_ROOT_DIR}/wsrep-lib/include") SET (ENGINE_SERVER_WSREP_API_INCLUDE "${SERVER_SOURCE_ROOT_DIR}/wsrep-lib/wsrep-API/v26/") SET (ENGINE_UTILS_UDFSDK_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/utils/udfsdk") -SET (ENGINE_DEFAULT_INCLUDES ${CMAKE_BINARY_DIR} "." "../" "../../" ${SERVER_BUILD_INCLUDE_DIR}) +SET (ENGINE_DEFAULT_INCLUDES ${CMAKE_CURRENT_BINARY_DIR} "." "../" "../../" ${SERVER_BUILD_INCLUDE_DIR}) + +IF (MY_READLINE_INCLUDE_DIR) + SET (ENGINE_DEFAULT_INCLUDES ${ENGINE_DEFAULT_INCLUDES} ${MY_READLINE_INCLUDE_DIR}) + SET (ENGINE_READLINE_LIBRARY ${MY_READLINE_LIBRARY}) +ELSE () + SET (ENGINE_DEFAULT_INCLUDES ${ENGINE_DEFAULT_INCLUDES} "/usr/include/readline/") + SET (ENGINE_READLINE_LIBRARY "readline") +ENDIF () SET (ENGINE_COMMON_INCLUDES ${ENGINE_DEFAULT_INCLUDES} ${Boost_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} ${ENGINE_UTILS_MESSAGEQCPP_INCLUDE} ${ENGINE_WE_SHARED_INCLUDE} ${ENGINE_UTILS_IDBDATAFILE_INCLUDE} ${ENGINE_UTILS_LOGGINGCPP_INCLUDE} ${ENGINE_UTILS_CONFIGCPP_INCLUDE} ${ENGINE_UTILS_COMPRESS_INCLUDE} ${ENGINE_VERSIONING_BRM_INCLUDE} ${ENGINE_UTILS_ROWGROUP_INCLUDE} ${ENGINE_UTILS_COMMON_INCLUDE} ${ENGINE_UTILS_DATACONVERT_INCLUDE} ${ENGINE_UTILS_RWLOCK_INCLUDE} ${ENGINE_UTILS_FUNCEXP_INCLUDE} ${ENGINE_OAMAPPS_ALARMMANAGER_INCLUDE} ${ENGINE_UTILS_INCLUDE} ${ENGINE_OAM_OAMCPP_INCLUDE} ${ENGINE_DBCON_DDLPKGPROC_INCLUDE} ${ENGINE_DBCON_DDLPKG_INCLUDE} ${ENGINE_DBCON_EXECPLAN_INCLUDE} ${ENGINE_UTILS_STARTUP_INCLUDE} ${ENGINE_DBCON_JOBLIST_INCLUDE} ${ENGINE_WE_WRAPPER_INCLUDE} ${ENGINE_WE_SERVER_INCLUDE} ${ENGINE_DBCON_DMLPKG_INCLUDE} ${ENGINE_WE_CLIENT_INCLUDE} ${ENGINE_DBCON_DMLPKGPROC_INCLUDE} ${ENGINE_UTILS_CACHEUTILS_INCLUDE} ${ENGINE_UTILS_MYSQLCL_INCLUDE} ${ENGINE_UTILS_QUERYTELE_INCLUDE} ${ENGINE_UTILS_THRIFT_INCLUDE} ${ENGINE_UTILS_JOINER_INCLUDE} ${ENGINE_UTILS_THREADPOOL_INCLUDE} ${ENGINE_UTILS_BATCHLDR_INCLUDE} ${ENGINE_UTILS_DDLCLEANUP_INCLUDE} ${ENGINE_UTILS_QUERYSTATS_INCLUDE} ${ENGINE_WE_CONFIGCPP_INCLUDE} ${ENGINE_SERVER_SQL_INCLUDE} ${ENGINE_SERVER_INCLUDE_INCLUDE} ${ENGINE_SERVER_PCRE_INCLUDE} ${ENGINE_SERVER_WSREP_API_INCLUDE} ${ENGINE_SERVER_WSREP_INCLUDE} ${ENGINE_UTILS_UDFSDK_INCLUDE} ${ENGINE_UTILS_LIBMYSQL_CL_INCLUDE}) @@ -354,27 +344,67 @@ IF( WITH_SHARED_COMP_TESTS ) ADD_SUBDIRECTORY(writeengine/shared) ENDIF( WITH_SHARED_COMP_TESTS ) -exec_program("git" - ${CMAKE_CURRENT_SOURCE_DIR} - ARGS "describe --match=NeVeRmAtCh --always --dirty" - OUTPUT_VARIABLE GIT_VERSION) +find_package(Git QUIET) + +IF (GIT_FOUND AND EXISTS ${ENGINE_SRC_DIR}/.git) + exec_program("git" + ${CMAKE_CURRENT_SOURCE_DIR} + ARGS "describe --match=NeVeRmAtCh --always --dirty" + OUTPUT_VARIABLE GIT_VERSION) +ELSE () + SET(GIT_VERSION "source") +ENDIF () # releasenum is used by external scripts for various tasks. Leave it alone. CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/releasenum.in ${CMAKE_CURRENT_BINARY_DIR}/build/releasenum IMMEDIATE) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/build/releasenum DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT platform) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/build/releasenum DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-platform) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/columnstoreversion.h.in ${CMAKE_CURRENT_SOURCE_DIR}/columnstoreversion.h) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mcsconfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/mcsconfig.h) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/gitversionEngine.in ${CMAKE_CURRENT_BINARY_DIR}/gitversionEngine IMMEDIATE) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gitversionEngine DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT platform) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gitversionEngine DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-platform) -# Do this or when MariaDB builds us we don't have GenError which is required for these IF (INSTALL_LAYOUT) + # Do this or when MariaDB builds us we don't have GenError which is required for these ADD_DEPENDENCIES(udf_mysql GenError) ADD_DEPENDENCIES(funcexp GenError) ADD_DEPENDENCIES(oamcpp GenError) ADD_DEPENDENCIES(regr_mysql GenError) -ENDIF () + # Component columnstore-engine automatically added by mysql_add_plugin() + SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} columnstore-platform columnstore-libs) + # Don't know why, but this doesn't work if you make the above line PARENT_SCOPE + SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} PARENT_SCOPE) + IF (RPM) + SET(ignored + "%ignore ${CMAKE_INSTALL_PREFIX}" + "%ignore ${CMAKE_INSTALL_PREFIX}/local" + "%ignore ${CMAKE_INSTALL_PREFIX}/bin" + "%ignore ${CMAKE_INSTALL_PREFIX}/lib" + "%ignore ${CMAKE_INSTALL_PREFIX}/sbin" + "%ignore ${CMAKE_INSTALL_PREFIX}/lib64/mysql" + "%ignore ${CMAKE_INSTALL_PREFIX}/lib64/mysql/plugin" + "%ignore /var/lib" + "%ignore /var" + ) + SET(CPACK_RPM_columnstore-platform_USER_FILELIST ${ignored} PARENT_SCOPE) + SET(CPACK_RPM_columnstore-libs_USER_FILELIST ${ignored} PARENT_SCOPE) + SET(CPACK_RPM_columnstore-engine_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*" PARENT_SCOPE) -INCLUDE(cpackEngineRPM) -INCLUDE(cpackEngineDEB) + SET(SUSE_VERSION_NUMBER OFF) + IF (EXISTS "/etc/SuSE-release") + file (READ "/etc/SuSE-release" SUSE_VERSION) + string(REGEX MATCH "VERSION = ([0-9]+)" SUSE "${SUSE_VERSION}") + set(SUSE_VERSION_NUMBER "${CMAKE_MATCH_1}") + ENDIF () + + if (${SUSE_VERSION_NUMBER} EQUAL 12) + SETA(CPACK_RPM_columnstore-platform_PACKAGE_REQUIRES "expect" "boost-devel >= 1.54.0" "MariaDB-columnstore-libs" "snappy" "jemalloc" "net-tools" PARENT_SCOPE) + else () + SETA(CPACK_RPM_columnstore-platform_PACKAGE_REQUIRES "expect" "boost >= 1.53.0" "MariaDB-columnstore-libs" "snappy" "jemalloc" "net-tools" PARENT_SCOPE) + endif() + ENDIF () +ELSE () + # MariaDB has its own packaging routines + INCLUDE(cpackEngineRPM) + INCLUDE(cpackEngineDEB) +ENDIF () diff --git a/cmake/columnstore_version.cmake b/cmake/columnstore_version.cmake index e8d0c7c2d..571fba591 100644 --- a/cmake/columnstore_version.cmake +++ b/cmake/columnstore_version.cmake @@ -2,7 +2,7 @@ # Generate "something" to trigger cmake rerun when VERSION changes CONFIGURE_FILE( - ${CMAKE_SOURCE_DIR}/VERSION + ${ENGINE_SRC_DIR}/VERSION ${CMAKE_BINARY_DIR}/VERSION.dep ) @@ -10,7 +10,7 @@ CONFIGURE_FILE( MACRO(COLUMNSTORE_GET_CONFIG_VALUE keyword var) IF(NOT ${var}) - FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=") + FILE (STRINGS ${ENGINE_SRC_DIR}/VERSION str REGEX "^[ ]*${keyword}=") IF(str) STRING(REPLACE "${keyword}=" "" str ${str}) STRING(REGEX REPLACE "[ ].*" "" str "${str}") @@ -20,27 +20,29 @@ MACRO(COLUMNSTORE_GET_CONFIG_VALUE keyword var) ENDMACRO() MACRO(GET_COLUMNSTORE_VERSION) - COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_MAJOR" MAJOR_VERSION) - COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_MINOR" MINOR_VERSION) - COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_PATCH" PATCH_VERSION) - COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_EXTRA" EXTRA_VERSION) - COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_RELEASE" RELEASE_VERSION) + COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_MAJOR" CS_MAJOR_VERSION) + COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_MINOR" CS_MINOR_VERSION) + COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_PATCH" CS_PATCH_VERSION) + COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_EXTRA" CS_EXTRA_VERSION) + COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_RELEASE" CS_RELEASE_VERSION) -IF(NOT "${MAJOR_VERSION}" MATCHES "[0-9]+" OR - NOT "${MINOR_VERSION}" MATCHES "[0-9]+" OR - NOT "${PATCH_VERSION}" MATCHES "[0-9]+") +IF(NOT "${CS_MAJOR_VERSION}" MATCHES "[0-9]+" OR + NOT "${CS_MINOR_VERSION}" MATCHES "[0-9]+" OR + NOT "${CS_PATCH_VERSION}" MATCHES "[0-9]+") MESSAGE(FATAL_ERROR "VERSION file cannot be parsed.") ENDIF() - SET(VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}") + SET(VERSION "${CS_MAJOR_VERSION}.${CS_MINOR_VERSION}.${CS_PATCH_VERSION}${CS_EXTRA_VERSION}") MESSAGE(STATUS "MariaDB-Columnstore ${VERSION}") - SET(CPACK_PACKAGE_VERSION_MAJOR ${MAJOR_VERSION}) - SET(CPACK_PACKAGE_VERSION_MINOR ${MINOR_VERSION}) - SET(CPACK_PACKAGE_VERSION_PATCH ${PATCH_VERSION}${EXTRA_VERSION}) - SET(PACKAGE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}") - SET(PACKAGE_RELEASE "${RELEASE_VERSION}") + IF (NOT INSTALL_LAYOUT) + SET(CPACK_PACKAGE_VERSION_MAJOR ${CS_MAJOR_VERSION}) + SET(CPACK_PACKAGE_VERSION_MINOR ${CS_MINOR_VERSION}) + SET(CPACK_PACKAGE_VERSION_PATCH ${CS_PATCH_VERSION}${CS_EXTRA_VERSION}) + ENDIF () + SET(PACKAGE_VERSION "${CS_MAJOR_VERSION}.${CS_MINOR_VERSION}.${CS_PATCH_VERSION}${CS_EXTRA_VERSION}") + SET(PACKAGE_RELEASE "${CS_RELEASE_VERSION}") ENDMACRO() # Get columnstore version -GET_COLUMNSTORE_VERSION() \ No newline at end of file +GET_COLUMNSTORE_VERSION() diff --git a/cmake/cpackEngineDEB.cmake b/cmake/cpackEngineDEB.cmake index 090a1f8c0..9b59b4b4b 100644 --- a/cmake/cpackEngineDEB.cmake +++ b/cmake/cpackEngineDEB.cmake @@ -11,9 +11,9 @@ SET(CPACK_PACKAGING_INSTALL_PREFIX ${INSTALL_ENGINE}) # Note that this variable is DEB not DEBIAN! http://public.kitware.com/pipermail/cmake/2014-July/058030.html SET(CPACK_DEB_COMPONENT_INSTALL ON) -SET(CPACK_COMPONENTS_ALL platform libs storage-engine) +SET(CPACK_COMPONENTS_ALL columnstore-platform columnstore-libs columnstore-engine) -SET(CPACK_PACKAGE_NAME "mariadb-columnstore") +SET(CPACK_PACKAGE_NAME "MariaDB") SET(ENGINE_ARCH "amd64") IF (NOT CPACK_DEBIAN_PACKAGE_VERSION) @@ -54,9 +54,9 @@ SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_DESCRIPTION "MariaDB Columnstore connect SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_SUMMARY "MariaDB ColumnStore: A Scale out Columnar storage engine for MariaDB") -SET(CPACK_DEBIAN_LIBS_PACKAGE_PROVIDES "mariadb-columnstore-libs") -SET(CPACK_DEBIAN_PLATFORM_PACKAGE_PROVIDES "mariadb-columnstore-platform") -SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_PROVIDES "mariadb-columnstore-storage-engine") +SET(CPACK_DEBIAN_LIBS_PACKAGE_PROVIDES "MariaDB-columnstore-libs") +SET(CPACK_DEBIAN_PLATFORM_PACKAGE_PROVIDES "MariaDB-columnstore-platform") +SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_PROVIDES "MariaDB-columnstore-engine") set(DEBIAN_VERSION_NUMBER OFF) if (EXISTS "/etc/debian_version") @@ -65,14 +65,14 @@ if (EXISTS "/etc/debian_version") set(DEBIAN_VERSION_NUMBER "${CMAKE_MATCH_1}") endif () if ("${DEBIAN_VERSION_NUMBER}" EQUAL "8") - SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, mariadb-columnstore-libs, mariadb-columnstore-server, libsnappy1, libjemalloc1 net-tools") + SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, MariaDB-columnstore-libs, libsnappy1, libjemalloc1") elseif ("${DEBIAN_VERSION_NUMBER}" EQUAL "9") - SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, mariadb-columnstore-libs, mariadb-columnstore-server, libsnappy1v5, libreadline5, libjemalloc1 net-tools") + SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, MariaDB-columnstore-libs, libsnappy1v5, libreadline5, libjemalloc1") else() - SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libboost-all-dev, libreadline-dev, rsync, libsnappy1v5, net-tools, libjemalloc1 net-tools") + SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libboost-all-dev, libreadline-dev, rsync, libsnappy1v5, net-tools, libjemalloc1") endif () -SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_DEPENDS "mariadb-columnstore-libs") +SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_DEPENDS "MariaDB-columnstore-libs") set( CPACK_DEBIAN_LIBS_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/build/debian/libs/postinst;${CMAKE_CURRENT_SOURCE_DIR}/build/debian/libs/prerm;" ) diff --git a/cmake/cpackEngineRPM.cmake b/cmake/cpackEngineRPM.cmake index 3802b02bc..ac1a88569 100644 --- a/cmake/cpackEngineRPM.cmake +++ b/cmake/cpackEngineRPM.cmake @@ -8,9 +8,9 @@ SET(CPACK_PACKAGING_INSTALL_PREFIX ${INSTALL_ENGINE}) SET(CPACK_RPM_COMPONENT_INSTALL ON) -SET(CPACK_COMPONENTS_ALL platform libs storage-engine) +SET(CPACK_COMPONENTS_ALL columnstore-platform columnstore-libs columnstore-engine) -SET(CPACK_PACKAGE_NAME "mariadb-columnstore") +SET(CPACK_PACKAGE_NAME "MariaDB") SET(ENGINE_ARCH "x86_64") IF (NOT CPACK_RPM_PACKAGE_VERSION) @@ -68,9 +68,9 @@ MACRO(SETA var) ENDFOREACH() ENDMACRO(SETA) -SETA(CPACK_RPM_libs_PACKAGE_PROVIDES "mariadb-columnstore-libs") -SETA(CPACK_RPM_platform_PACKAGE_PROVIDES "mariadb-columnstore-platform") -SETA(CPACK_RPM_storage-engine_PACKAGE_PROVIDES "mariadb-columnstore-storage-engine") +SETA(CPACK_RPM_libs_PACKAGE_PROVIDES "MariaDB-columnstore-libs") +SETA(CPACK_RPM_platform_PACKAGE_PROVIDES "MariaDB-columnstore-platform") +SETA(CPACK_RPM_storage-engine_PACKAGE_PROVIDES "MariaDB-columnstore-engine") #boost is a source build in CentOS 6 so don't require it as a package @@ -87,16 +87,16 @@ IF (EXISTS "/etc/SuSE-release") set(SUSE_VERSION_NUMBER "${CMAKE_MATCH_1}") ENDIF () if (${REDHAT_VERSION_NUMBER} EQUAL 6) - SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "mariadb-columnstore-libs" "mariadb-columnstore-shared" "snappy" "net-tools") + SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "MariaDB-columnstore-libs" "MariaDB-columnstore-shared" "snappy" "net-tools") # Disable auto require as this will also try to pull Boost via RPM SET(CPACK_RPM_PACKAGE_AUTOREQPROV " no") elseif (${SUSE_VERSION_NUMBER} EQUAL 12) - SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "boost-devel >= 1.54.0" "mariadb-columnstore-libs" "libsnappy1" "jemalloc" "net-tools") + SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "boost-devel >= 1.54.0" "MariaDB-columnstore-libs" "libsnappy1" "jemalloc" "net-tools") else () - SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "boost >= 1.53.0" "mariadb-columnstore-libs" "snappy" "jemalloc" "net-tools") + SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "boost >= 1.53.0" "MariaDB-columnstore-libs" "snappy" "jemalloc" "net-tools") endif() -SETA(CPACK_RPM_storage-engine_PACKAGE_REQUIRES "mariadb-columnstore-libs") +SETA(CPACK_RPM_storage-engine_PACKAGE_REQUIRES "MariaDB-columnstore-libs") SET(CPACK_RPM_platform_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postInstall_platform.sh) SET(CPACK_RPM_libs_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postInstall_libs.sh) diff --git a/columnstoreversion.h.in b/columnstoreversion.h.in index 2746bd60c..c0b557ff2 100644 --- a/columnstoreversion.h.in +++ b/columnstoreversion.h.in @@ -1,7 +1,7 @@ #ifndef VERSIONNUMBER_H_ #define VERSIONNUMBER_H_ #include -const std::string columnstore_version("${VERSION}"); +const std::string columnstore_version("${PACKAGE_VERSION}"); const std::string columnstore_release("${PACKAGE_RELEASE}"); const std::string columnstore_commit_hash("${GIT_VERSION}"); #endif diff --git a/dbcon/ddlpackage/CMakeLists.txt b/dbcon/ddlpackage/CMakeLists.txt index 8bdc68b1e..4e95ff073 100644 --- a/dbcon/ddlpackage/CMakeLists.txt +++ b/dbcon/ddlpackage/CMakeLists.txt @@ -35,7 +35,5 @@ ADD_LIBRARY(ddlpackage SHARED ${CMAKE_CURRENT_SOURCE_DIR}/ddl-scan.cpp ) -SET_TARGET_PROPERTIES(ddlpackage PROPERTIES VERSION 1.0.0 SOVERSION 1) - -INSTALL(TARGETS ddlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +INSTALL(TARGETS ddlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/dbcon/ddlpackageproc/CMakeLists.txt b/dbcon/ddlpackageproc/CMakeLists.txt index 31e6af0a8..e23091615 100644 --- a/dbcon/ddlpackageproc/CMakeLists.txt +++ b/dbcon/ddlpackageproc/CMakeLists.txt @@ -16,7 +16,5 @@ add_library(ddlpackageproc SHARED ${ddlpackageproc_LIB_SRCS}) target_link_libraries(ddlpackageproc ${NETSNMP_LIBRARIES}) -set_target_properties(ddlpackageproc PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS ddlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS ddlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/dbcon/dmlpackage/CMakeLists.txt b/dbcon/dmlpackage/CMakeLists.txt index 4e711c967..b54bbc822 100644 --- a/dbcon/dmlpackage/CMakeLists.txt +++ b/dbcon/dmlpackage/CMakeLists.txt @@ -37,7 +37,5 @@ ADD_LIBRARY(dmlpackage SHARED ) -SET_TARGET_PROPERTIES(dmlpackage PROPERTIES VERSION 1.0.0 SOVERSION 1) - -INSTALL(TARGETS dmlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +INSTALL(TARGETS dmlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/dbcon/dmlpackageproc/CMakeLists.txt b/dbcon/dmlpackageproc/CMakeLists.txt index 3bede4ee9..f63db5522 100644 --- a/dbcon/dmlpackageproc/CMakeLists.txt +++ b/dbcon/dmlpackageproc/CMakeLists.txt @@ -17,8 +17,6 @@ add_library(dmlpackageproc SHARED ${dmlpackageproc_LIB_SRCS}) target_link_libraries(dmlpackageproc ${NETSNMP_LIBRARIES}) -set_target_properties(dmlpackageproc PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS dmlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS dmlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/dbcon/execplan/CMakeLists.txt b/dbcon/execplan/CMakeLists.txt index eb354691b..a038384cc 100755 --- a/dbcon/execplan/CMakeLists.txt +++ b/dbcon/execplan/CMakeLists.txt @@ -48,7 +48,5 @@ add_library(execplan SHARED ${execplan_LIB_SRCS}) target_link_libraries(execplan ${NETSNMP_LIBRARIES}) -set_target_properties(execplan PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS execplan DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS execplan DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/dbcon/joblist/CMakeLists.txt b/dbcon/joblist/CMakeLists.txt index c450b61af..072194795 100644 --- a/dbcon/joblist/CMakeLists.txt +++ b/dbcon/joblist/CMakeLists.txt @@ -59,13 +59,11 @@ set(joblist_LIB_SRCS add_library(joblist SHARED ${joblist_LIB_SRCS}) -set_target_properties(joblist PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS joblist DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS joblist DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) if (WITH_ORDERBY_UT) add_executable(job_orderby_tests orderby-tests.cpp) target_link_libraries(job_orderby_tests ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${CPPUNIT_LIBRARIES} cppunit) - install(TARGETS job_orderby_tests DESTINATION ${ENGINE_BINDIR} COMPONENT platform) + install(TARGETS job_orderby_tests DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) endif() diff --git a/dbcon/joblist/expressionstep.cpp b/dbcon/joblist/expressionstep.cpp index f8020a6c9..e5d656936 100644 --- a/dbcon/joblist/expressionstep.cpp +++ b/dbcon/joblist/expressionstep.cpp @@ -509,7 +509,7 @@ void ExpressionStep::updateInputIndex(map& indexMap, const J CalpontSystemCatalog::OID oid = sc->oid(); CalpontSystemCatalog::OID dictOid = 0; CalpontSystemCatalog::ColType ct; - uint32_t key = fColumnKeys[distance(fColumns.begin(), it)]; + uint32_t key = fColumnKeys[std::distance(fColumns.begin(), it)]; if (sc->schemaName().empty()) { diff --git a/dbcon/joblist/groupconcat.cpp b/dbcon/joblist/groupconcat.cpp index 283a73090..7f832946e 100644 --- a/dbcon/joblist/groupconcat.cpp +++ b/dbcon/joblist/groupconcat.cpp @@ -263,7 +263,7 @@ void GroupConcatInfo::mapColumns(const RowGroup& projRG) } else { - idx = distance(keys.begin(), i3); + idx = std::distance(keys.begin(), i3); } (*k)->fOrderCond.push_back(make_pair(idx, i2->second)); diff --git a/dbcon/joblist/jlf_tuplejoblist.cpp b/dbcon/joblist/jlf_tuplejoblist.cpp index 713703ae8..dbcba47ea 100644 --- a/dbcon/joblist/jlf_tuplejoblist.cpp +++ b/dbcon/joblist/jlf_tuplejoblist.cpp @@ -1007,12 +1007,12 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo) unsigned itInc = 1; // iterator increase number unsigned numOfStepsAddToBps = 0; // # steps to be added into TBPS - if ((distance(it, end) > 2 && + if ((std::distance(it, end) > 2 && dynamic_cast(it->get()) != NULL && (dynamic_cast((it + 1)->get()) != NULL || dynamic_cast((it + 1)->get()) != NULL) && dynamic_cast((it + 2)->get()) != NULL) || - (distance(it, end) > 1 && + (std::distance(it, end) > 1 && dynamic_cast(it->get()) != NULL && dynamic_cast((it + 1)->get()) != NULL)) { @@ -1053,7 +1053,7 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo) itInc = 1; numOfStepsAddToBps = 0; } - else if (distance(begin, it) > 1 && + else if (std::distance(begin, it) > 1 && (dynamic_cast((it - 1)->get()) != NULL || dynamic_cast((it - 2)->get()) != NULL) && dynamic_cast(it->get()) != NULL) @@ -1062,14 +1062,14 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo) itInc = 1; numOfStepsAddToBps = 0; } - else if (distance(it, end) > 2 && + else if (std::distance(it, end) > 2 && dynamic_cast((it + 1)->get()) != NULL && dynamic_cast((it + 2)->get()) != NULL) { itInc = 3; numOfStepsAddToBps = 3; } - else if (distance(it, end) > 3 && + else if (std::distance(it, end) > 3 && dynamic_cast((it + 1)->get()) != NULL && dynamic_cast((it + 2)->get()) != NULL && dynamic_cast((it + 3)->get()) != NULL) @@ -1077,7 +1077,7 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo) itInc = 4; numOfStepsAddToBps = 4; } - else if (distance(it, end) > 3 && + else if (std::distance(it, end) > 3 && dynamic_cast((it + 1)->get()) != NULL && dynamic_cast((it + 2)->get()) != NULL && dynamic_cast((it + 3)->get()) != NULL) @@ -1085,7 +1085,7 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo) itInc = 4; numOfStepsAddToBps = 4; } - else if (distance(it, end) > 4 && + else if (std::distance(it, end) > 4 && dynamic_cast((it + 1)->get()) != NULL && dynamic_cast((it + 2)->get()) != NULL && dynamic_cast((it + 3)->get()) != NULL && @@ -1094,7 +1094,7 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo) itInc = 5; numOfStepsAddToBps = 5; } - else if (distance(it, end) > 1 && + else if (std::distance(it, end) > 1 && (dynamic_cast(it->get()) != NULL || dynamic_cast(it->get()) != NULL) && dynamic_cast((it + 1)->get()) != NULL) @@ -2060,7 +2060,7 @@ uint32_t getKeyIndex(uint32_t key, const RowGroup& rg) if (i == rg.getKeys().end()) throw runtime_error("No key found."); - return distance(rg.getKeys().begin(), i); + return std::distance(rg.getKeys().begin(), i); } diff --git a/dbcon/joblist/joblistfactory.cpp b/dbcon/joblist/joblistfactory.cpp index b087c54ac..392387d4b 100644 --- a/dbcon/joblist/joblistfactory.cpp +++ b/dbcon/joblist/joblistfactory.cpp @@ -1110,11 +1110,11 @@ const JobStepVector doAggProject(const CalpontSelectExecutionPlan* csep, JobInfo else it = pcv.insert(pcv.end(), srcp); - projectKeys.insert(projectKeys.begin() + distance(pcv.begin(), it), tupleKey); + projectKeys.insert(projectKeys.begin() + std::distance(pcv.begin(), it), tupleKey); } else if (doDistinct) // @bug4250, move forward distinct column if necessary. { - uint32_t pos = distance(projectKeys.begin(), keyIt); + uint32_t pos = std::distance(projectKeys.begin(), keyIt); if (pos >= lastGroupByPos) { @@ -1263,11 +1263,11 @@ const JobStepVector doAggProject(const CalpontSelectExecutionPlan* csep, JobInfo else it = pcv.insert(pcv.end(), srcp); - projectKeys.insert(projectKeys.begin() + distance(pcv.begin(), it), tupleKey); + projectKeys.insert(projectKeys.begin() + std::distance(pcv.begin(), it), tupleKey); } else if (doDistinct) // @bug4250, move forward distinct column if necessary. { - uint32_t pos = distance(projectKeys.begin(), keyIt); + uint32_t pos = std::distance(projectKeys.begin(), keyIt); if (pos >= lastGroupByPos) { @@ -1392,7 +1392,7 @@ void changePcolStepToPcolScan(JobStepVector::iterator& it, JobStepVector::iterat { //If we have a pDictionaryScan-pColStep duo, then change the pColStep if (typeid(*(it->get())) == typeid(pDictionaryScan) && - distance(it, end) > 1 && + std::distance(it, end) > 1 && typeid(*((it + 1)->get())) == typeid(pColStep)) { ++it; diff --git a/dbcon/joblist/windowfunctionstep.cpp b/dbcon/joblist/windowfunctionstep.cpp index c09224899..ab1acd1fe 100755 --- a/dbcon/joblist/windowfunctionstep.cpp +++ b/dbcon/joblist/windowfunctionstep.cpp @@ -1647,8 +1647,8 @@ void WindowFunctionStep::sort(std::vector::iterator v, uint64_t n) } } - sort(v, distance(v, h) + 1); - sort(l, distance(l, v) + n); + sort(v, std::distance(v, h) + 1); + sort(l, std::distance(l, v) + n); } diff --git a/dbcon/mysql/CMakeLists.txt b/dbcon/mysql/CMakeLists.txt index ec1f84c47..6a06ad703 100644 --- a/dbcon/mysql/CMakeLists.txt +++ b/dbcon/mysql/CMakeLists.txt @@ -35,7 +35,7 @@ set_source_files_properties(ha_mcs.cpp PROPERTIES COMPILE_FLAGS "-fno-implicit-t if (COMMAND mysql_add_plugin) mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY DEFAULT - LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool + LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool COMPONENT columnstore-engine) else () add_library(ha_columnstore SHARED ${libcalmysql_SRCS}) @@ -43,9 +43,7 @@ else () target_link_libraries(ha_columnstore ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool) - set_target_properties(ha_columnstore PROPERTIES VERSION 1.0.0 SOVERSION 1) - - install(TARGETS ha_columnstore DESTINATION ${MARIADB_PLUGINDIR} COMPONENT storage-engine) + install(TARGETS ha_columnstore DESTINATION ${MARIADB_PLUGINDIR} COMPONENT columnstore-engine) endif () install(FILES syscatalog_mysql.sql dumpcat_mysql.sql @@ -53,9 +51,9 @@ install(FILES syscatalog_mysql.sql calremoveuserpriority.sql calshowprocesslist.sql columnstore_info.sql - DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT storage-engine) + DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-engine) install(PROGRAMS install_mcs_mysql.sh mysql-Columnstore - DESTINATION ${ENGINE_SBINDIR} COMPONENT storage-engine) + DESTINATION ${ENGINE_SBINDIR} COMPONENT columnstore-engine) install(FILES columnstore.cnf - DESTINATION ${MARIADB_MYCNFDIR} COMPONENT storage-engine) + DESTINATION ${MARIADB_MYCNFDIR} COMPONENT columnstore-engine) diff --git a/ddlproc/CMakeLists.txt b/ddlproc/CMakeLists.txt index 222313a69..80703b77b 100644 --- a/ddlproc/CMakeLists.txt +++ b/ddlproc/CMakeLists.txt @@ -10,5 +10,5 @@ add_executable(DDLProc ${DDLProc_SRCS}) target_link_libraries(DDLProc ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool) -install(TARGETS DDLProc DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS DDLProc DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/dmlproc/CMakeLists.txt b/dmlproc/CMakeLists.txt index fece5b614..267b9aee7 100644 --- a/dmlproc/CMakeLists.txt +++ b/dmlproc/CMakeLists.txt @@ -15,7 +15,7 @@ add_executable(DMLProc ${DMLProc_SRCS}) target_link_libraries(DMLProc ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool ddlcleanuputil batchloader) -install(TARGETS DMLProc DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS DMLProc DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/exemgr/CMakeLists.txt b/exemgr/CMakeLists.txt index 4c8e7b65c..ae4ca54b4 100644 --- a/exemgr/CMakeLists.txt +++ b/exemgr/CMakeLists.txt @@ -12,7 +12,7 @@ target_link_libraries(ExeMgr ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIB target_include_directories(ExeMgr PRIVATE ${Boost_INCLUDE_DIRS}) -install(TARGETS ExeMgr DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS ExeMgr DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### install files ############### diff --git a/oam/cloud/CMakeLists.txt b/oam/cloud/CMakeLists.txt index 8d16f4a29..b5e7130ab 100644 --- a/oam/cloud/CMakeLists.txt +++ b/oam/cloud/CMakeLists.txt @@ -1,4 +1,4 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/MCSVolumeCmds.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/MCSVolumeCmds.sh" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/MCSInstanceCmds.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/MCSInstanceCmds.sh" @ONLY) -install(PROGRAMS MCSInstanceCmds.sh MCSVolumeCmds.sh MCSgetCredentials.sh DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(PROGRAMS MCSInstanceCmds.sh MCSVolumeCmds.sh MCSgetCredentials.sh DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/oam/etc/CMakeLists.txt b/oam/etc/CMakeLists.txt index 735555108..3223de1d4 100644 --- a/oam/etc/CMakeLists.txt +++ b/oam/etc/CMakeLists.txt @@ -4,4 +4,4 @@ install(FILES AlarmConfig.xml Columnstore.xml ProcessConfig.xml ConsoleCmds.xml - DESTINATION ${ENGINE_SYSCONFDIR}/columnstore COMPONENT platform) + DESTINATION ${ENGINE_SYSCONFDIR}/columnstore COMPONENT columnstore-platform) diff --git a/oam/install_scripts/CMakeLists.txt b/oam/install_scripts/CMakeLists.txt index 632f85c3a..05387c5d0 100644 --- a/oam/install_scripts/CMakeLists.txt +++ b/oam/install_scripts/CMakeLists.txt @@ -34,7 +34,7 @@ install(PROGRAMS columnstore-post-install disable-rep-columnstore.sh mariadb-command-line.sh mcs_module_installer.sh - DESTINATION ${ENGINE_BINDIR} COMPONENT platform) + DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) install(FILES columnstore.service columnstoreAlias @@ -44,7 +44,7 @@ install(FILES columnstore.service columnstoreLogRotate myCnf-include-args.text myCnf-exclude-args.text - DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT platform) + DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-platform) - install(FILES module DESTINATION ${ENGINE_DATADIR}/local COMPONENT platform) +install(FILES module DESTINATION ${ENGINE_DATADIR}/local COMPONENT columnstore-platform) diff --git a/oam/oamcpp/CMakeLists.txt b/oam/oamcpp/CMakeLists.txt index 413673504..a1fd0292e 100644 --- a/oam/oamcpp/CMakeLists.txt +++ b/oam/oamcpp/CMakeLists.txt @@ -12,7 +12,5 @@ target_link_libraries(oamcpp ) target_compile_options(oamcpp PRIVATE -Wno-unused-result) -set_target_properties(oamcpp PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS oamcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS oamcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/oam/post/CMakeLists.txt b/oam/post/CMakeLists.txt index 43de4807f..7ac1d273c 100644 --- a/oam/post/CMakeLists.txt +++ b/oam/post/CMakeLists.txt @@ -3,5 +3,5 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcstest-002.sh.in" "${CMAKE_CURRENT_ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcstest-003.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcstest-003.sh" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcstest-004.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcstest-004.sh" @ONLY) -install(PROGRAMS columnstore_functions mcstest-001.sh mcstest-002.sh mcstest-003.sh mcstest-004.sh DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT platform) +install(PROGRAMS columnstore_functions mcstest-001.sh mcstest-002.sh mcstest-003.sh mcstest-004.sh DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-platform) diff --git a/oamapps/alarmmanager/CMakeLists.txt b/oamapps/alarmmanager/CMakeLists.txt index a6b12ab75..b1e028717 100644 --- a/oamapps/alarmmanager/CMakeLists.txt +++ b/oamapps/alarmmanager/CMakeLists.txt @@ -10,8 +10,6 @@ add_library(alarmmanager SHARED ${alarmmanager_LIB_SRCS}) target_compile_options(alarmmanager PRIVATE -Wno-unused-result) -set_target_properties(alarmmanager PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS alarmmanager DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS alarmmanager DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/oamapps/columnstoreDB/CMakeLists.txt b/oamapps/columnstoreDB/CMakeLists.txt index df17ff3e2..b9e483ad3 100644 --- a/oamapps/columnstoreDB/CMakeLists.txt +++ b/oamapps/columnstoreDB/CMakeLists.txt @@ -10,5 +10,5 @@ add_executable(columnstoreDBWrite ${columnstoreDBWrite_SRCS}) target_link_libraries(columnstoreDBWrite ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS columnstoreDBWrite DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS columnstoreDBWrite DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/oamapps/columnstoreSupport/CMakeLists.txt b/oamapps/columnstoreSupport/CMakeLists.txt index 98573e2b0..5d19b0784 100644 --- a/oamapps/columnstoreSupport/CMakeLists.txt +++ b/oamapps/columnstoreSupport/CMakeLists.txt @@ -10,11 +10,11 @@ add_executable(columnstoreSupport ${columnstoreSupport_SRCS}) target_compile_options(columnstoreSupport PRIVATE -Wno-unused-result) -target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) +target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS columnstoreSupport DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS columnstoreSupport DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) install(PROGRAMS alarmReport.sh bulklogReport.sh configReport.sh hardwareReport.sh logReport.sh resourceReport.sh softwareReport.sh - DESTINATION ${ENGINE_BINDIR} COMPONENT platform) + DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/oamapps/columnstoreSupport/columnstoreSupport.cpp b/oamapps/columnstoreSupport/columnstoreSupport.cpp index 93cb23ada..3c6f487a4 100644 --- a/oamapps/columnstoreSupport/columnstoreSupport.cpp +++ b/oamapps/columnstoreSupport/columnstoreSupport.cpp @@ -27,7 +27,7 @@ #include "stdio.h" #include "ctype.h" #include -#include +#include #include "mcsconfig.h" #include "liboamcpp.h" diff --git a/oamapps/mcsadmin/CMakeLists.txt b/oamapps/mcsadmin/CMakeLists.txt index 1052d77f8..63ef583a0 100644 --- a/oamapps/mcsadmin/CMakeLists.txt +++ b/oamapps/mcsadmin/CMakeLists.txt @@ -10,7 +10,7 @@ add_executable(mcsadmin ${mcsadmin_SRCS}) target_compile_options(mcsadmin PRIVATE -Wno-unused-result) -target_link_libraries(mcsadmin ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS} ${ENGINE_WRITE_LIBS}) +target_link_libraries(mcsadmin ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS} ${ENGINE_WRITE_LIBS}) -install(TARGETS mcsadmin DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS mcsadmin DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/oamapps/mcsadmin/mcsadmin.h b/oamapps/mcsadmin/mcsadmin.h index 66fda95c8..59fd366a2 100644 --- a/oamapps/mcsadmin/mcsadmin.h +++ b/oamapps/mcsadmin/mcsadmin.h @@ -39,8 +39,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/oamapps/postConfigure/CMakeLists.txt b/oamapps/postConfigure/CMakeLists.txt index 55831d259..8f573d0a8 100644 --- a/oamapps/postConfigure/CMakeLists.txt +++ b/oamapps/postConfigure/CMakeLists.txt @@ -10,9 +10,9 @@ add_executable(postConfigure ${postConfigure_SRCS}) target_compile_options(postConfigure PRIVATE -Wno-unused-result) -target_link_libraries(postConfigure ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) +target_link_libraries(postConfigure ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS postConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS postConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -23,9 +23,9 @@ add_executable(columnstore_installer ${installer_SRCS}) target_compile_options(columnstore_installer PRIVATE -Wno-unused-result) -target_link_libraries(columnstore_installer ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) +target_link_libraries(columnstore_installer ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS columnstore_installer DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS columnstore_installer DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -34,9 +34,9 @@ set(getMySQLpw_SRCS getMySQLpw.cpp) add_executable(getMySQLpw ${getMySQLpw_SRCS}) -target_link_libraries(getMySQLpw ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) +target_link_libraries(getMySQLpw ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS getMySQLpw DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS getMySQLpw DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -45,9 +45,9 @@ install(TARGETS getMySQLpw DESTINATION ${ENGINE_BINDIR} COMPONENT platform) #add_executable(amazonInstaller ${amazonInstaller_SRCS}) -#target_link_libraries(amazonInstaller ${ENGINE_LDFLAGS} readline ncurses ${SNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) +#target_link_libraries(amazonInstaller ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${SNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -#install(TARGETS amazonInstaller DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +#install(TARGETS amazonInstaller DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -58,12 +58,12 @@ add_executable(mycnfUpgrade ${mycnfUpgrade_SRCS}) target_compile_options(mycnfUpgrade PRIVATE -Wno-unused-result) -target_link_libraries(mycnfUpgrade ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) +target_link_libraries(mycnfUpgrade ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### install(PROGRAMS quick_installer_single_server.sh quick_installer_multi_server.sh quick_installer_amazon.sh - DESTINATION ${ENGINE_BINDIR} COMPONENT platform) + DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/oamapps/postConfigure/helpers.cpp b/oamapps/postConfigure/helpers.cpp index 2df779195..a61d7a1f0 100644 --- a/oamapps/postConfigure/helpers.cpp +++ b/oamapps/postConfigure/helpers.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include "mcsconfig.h" #include "configcpp.h" diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp index bfaeee084..953f7bcc4 100644 --- a/oamapps/postConfigure/postConfigure.cpp +++ b/oamapps/postConfigure/postConfigure.cpp @@ -62,8 +62,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/oamapps/serverMonitor/CMakeLists.txt b/oamapps/serverMonitor/CMakeLists.txt index 59fbad662..dbd4dcd53 100644 --- a/oamapps/serverMonitor/CMakeLists.txt +++ b/oamapps/serverMonitor/CMakeLists.txt @@ -22,5 +22,5 @@ target_compile_options(ServerMonitor PRIVATE -Wno-unused-result) target_link_libraries(ServerMonitor ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS ServerMonitor DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS ServerMonitor DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/primitives/primproc/CMakeLists.txt b/primitives/primproc/CMakeLists.txt index 477792b0d..f96f8eecb 100644 --- a/primitives/primproc/CMakeLists.txt +++ b/primitives/primproc/CMakeLists.txt @@ -27,6 +27,6 @@ add_executable(PrimProc ${PrimProc_SRCS}) target_link_libraries(PrimProc ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} threadpool cacheutils dbbc processor) -install(TARGETS PrimProc DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS PrimProc DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/procmgr/CMakeLists.txt b/procmgr/CMakeLists.txt index 99320901d..f1bc5fa09 100644 --- a/procmgr/CMakeLists.txt +++ b/procmgr/CMakeLists.txt @@ -12,5 +12,5 @@ target_compile_options(ProcMgr PRIVATE -Wno-unused-result) target_link_libraries(ProcMgr ${ENGINE_LDFLAGS} cacheutils ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS ProcMgr DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS ProcMgr DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/procmon/CMakeLists.txt b/procmon/CMakeLists.txt index bd6efcceb..a0a8045a1 100644 --- a/procmon/CMakeLists.txt +++ b/procmon/CMakeLists.txt @@ -12,5 +12,5 @@ target_compile_options(ProcMon PRIVATE -Wno-unused-result) target_link_libraries(ProcMon ${ENGINE_LDFLAGS} cacheutils ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS ProcMon DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS ProcMon DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/storage-manager/CMakeLists.txt b/storage-manager/CMakeLists.txt index 3109efd73..d63fe8296 100755 --- a/storage-manager/CMakeLists.txt +++ b/storage-manager/CMakeLists.txt @@ -60,7 +60,7 @@ set(CMAKE_INSTALL_RPATH $ORIGIN $ORIGIN/../lib) add_library(storagemanager SHARED ${storagemanager_SRCS}) add_dependencies(storagemanager marias3) target_compile_definitions(storagemanager PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS) -target_link_libraries(storagemanager boost_system boost_thread boost_filesystem boost_regex pthread ${S3API_DEPS}) +target_link_libraries(storagemanager boost_chrono boost_system boost_thread boost_filesystem boost_regex pthread ${S3API_DEPS}) set_property(TARGET storagemanager PROPERTY CXX_STANDARD 11) add_executable(StorageManager src/main.cpp) @@ -126,16 +126,16 @@ target_link_libraries(smrm storagemanager cloudio install(TARGETS storagemanager LIBRARY DESTINATION ${ENGINE_LIBDIR} - COMPONENT platform + COMPONENT columnstore-platform ) install(TARGETS StorageManager smcat smput smls smrm RUNTIME DESTINATION ${ENGINE_BINDIR} - COMPONENT platform + COMPONENT columnstore-platform ) install(FILES storagemanager.cnf DESTINATION ${ENGINE_SYSCONFDIR}/columnstore - COMPONENT platform) + COMPONENT columnstore-platform) diff --git a/storage-manager/src/Ownership.h b/storage-manager/src/Ownership.h index fc53769c4..5327c940e 100644 --- a/storage-manager/src/Ownership.h +++ b/storage-manager/src/Ownership.h @@ -19,6 +19,7 @@ #define OWNERSHIP_H_ #include +#include #include #include #include "SMLogging.h" diff --git a/storage-manager/src/ThreadPool.h b/storage-manager/src/ThreadPool.h index e72780eff..3bf811a55 100644 --- a/storage-manager/src/ThreadPool.h +++ b/storage-manager/src/ThreadPool.h @@ -23,6 +23,7 @@ #include #include #include +#include #include "SMLogging.h" namespace storagemanager diff --git a/tools/clearShm/CMakeLists.txt b/tools/clearShm/CMakeLists.txt index 301a14494..14a68ce09 100644 --- a/tools/clearShm/CMakeLists.txt +++ b/tools/clearShm/CMakeLists.txt @@ -10,5 +10,5 @@ add_executable(clearShm ${clearShm_SRCS}) target_link_libraries(clearShm ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS clearShm DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS clearShm DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/cleartablelock/CMakeLists.txt b/tools/cleartablelock/CMakeLists.txt index b87712fd4..d80ca05d7 100644 --- a/tools/cleartablelock/CMakeLists.txt +++ b/tools/cleartablelock/CMakeLists.txt @@ -10,5 +10,5 @@ add_executable(cleartablelock ${cleartablelock_SRCS}) target_link_libraries(cleartablelock ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS}) -install(TARGETS cleartablelock DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS cleartablelock DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/configMgt/CMakeLists.txt b/tools/configMgt/CMakeLists.txt index 12eb03cb1..ac6aaa236 100644 --- a/tools/configMgt/CMakeLists.txt +++ b/tools/configMgt/CMakeLists.txt @@ -10,4 +10,4 @@ add_executable(autoConfigure ${autoConfigure_SRCS}) target_link_libraries(autoConfigure ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS autoConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS autoConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/configMgt/configure.cpp b/tools/configMgt/configure.cpp index 38a686d49..be4461cde 100644 --- a/tools/configMgt/configure.cpp +++ b/tools/configMgt/configure.cpp @@ -46,8 +46,8 @@ #include "ctype.h" #include -#include -#include +#include +#include #include "liboamcpp.h" #include "configcpp.h" diff --git a/tools/cplogger/CMakeLists.txt b/tools/cplogger/CMakeLists.txt index be05afe50..4a9af844f 100644 --- a/tools/cplogger/CMakeLists.txt +++ b/tools/cplogger/CMakeLists.txt @@ -10,5 +10,5 @@ add_executable(cplogger ${cplogger_SRCS}) target_link_libraries(cplogger ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS cplogger DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS cplogger DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/dbbuilder/CMakeLists.txt b/tools/dbbuilder/CMakeLists.txt index 1d09cd6aa..c9b5ab816 100644 --- a/tools/dbbuilder/CMakeLists.txt +++ b/tools/dbbuilder/CMakeLists.txt @@ -10,5 +10,5 @@ add_executable(dbbuilder ${dbbuilder_SRCS}) target_link_libraries(dbbuilder ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS}) -install(TARGETS dbbuilder DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS dbbuilder DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/dbloadxml/CMakeLists.txt b/tools/dbloadxml/CMakeLists.txt index 52532ca40..d7629c96b 100644 --- a/tools/dbloadxml/CMakeLists.txt +++ b/tools/dbloadxml/CMakeLists.txt @@ -15,5 +15,5 @@ add_executable(colxml ${colxml_SRCS}) target_link_libraries(colxml ${ENGINE_LDFLAGS} dbload ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS}) -install(TARGETS colxml DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS colxml DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/ddlcleanup/CMakeLists.txt b/tools/ddlcleanup/CMakeLists.txt index 8094aeaaa..c8cac521c 100644 --- a/tools/ddlcleanup/CMakeLists.txt +++ b/tools/ddlcleanup/CMakeLists.txt @@ -10,5 +10,5 @@ add_executable(ddlcleanup ${ddlcleanup_SRCS}) target_link_libraries(ddlcleanup ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ddlcleanuputil) -install(TARGETS ddlcleanup DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS ddlcleanup DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/editem/CMakeLists.txt b/tools/editem/CMakeLists.txt index 15d2dfe31..f7e38728d 100644 --- a/tools/editem/CMakeLists.txt +++ b/tools/editem/CMakeLists.txt @@ -10,5 +10,5 @@ add_executable(editem ${editem_SRCS}) target_link_libraries(editem ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS editem DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS editem DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/getConfig/CMakeLists.txt b/tools/getConfig/CMakeLists.txt index 8266b163b..a79409370 100644 --- a/tools/getConfig/CMakeLists.txt +++ b/tools/getConfig/CMakeLists.txt @@ -10,5 +10,5 @@ add_executable(mcsGetConfig ${getConfig_SRCS}) target_link_libraries(mcsGetConfig ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS mcsGetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS mcsGetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/idbmeminfo/CMakeLists.txt b/tools/idbmeminfo/CMakeLists.txt index 4c9908b23..905c63c95 100644 --- a/tools/idbmeminfo/CMakeLists.txt +++ b/tools/idbmeminfo/CMakeLists.txt @@ -10,5 +10,5 @@ add_executable(idbmeminfo ${idbmeminfo_SRCS}) target_link_libraries(idbmeminfo ${ENGINE_LDFLAGS}) -install(TARGETS idbmeminfo DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS idbmeminfo DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/setConfig/CMakeLists.txt b/tools/setConfig/CMakeLists.txt index 4cecd0f98..a1a0cad2c 100644 --- a/tools/setConfig/CMakeLists.txt +++ b/tools/setConfig/CMakeLists.txt @@ -11,7 +11,7 @@ add_executable(mcsSetConfig ${setConfig_SRCS}) target_link_libraries(mcsSetConfig ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS mcsSetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS mcsSetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) -install(PROGRAMS configxml.sh DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(PROGRAMS configxml.sh DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/viewtablelock/CMakeLists.txt b/tools/viewtablelock/CMakeLists.txt index 44d45bafa..24f97293a 100644 --- a/tools/viewtablelock/CMakeLists.txt +++ b/tools/viewtablelock/CMakeLists.txt @@ -10,5 +10,5 @@ add_executable(viewtablelock ${viewtablelock_SRCS}) target_link_libraries(viewtablelock ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS viewtablelock DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS viewtablelock DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/utils/batchloader/CMakeLists.txt b/utils/batchloader/CMakeLists.txt index 07ecc04e5..474133f95 100644 --- a/utils/batchloader/CMakeLists.txt +++ b/utils/batchloader/CMakeLists.txt @@ -10,8 +10,6 @@ add_library(batchloader SHARED ${batchloader_LIB_SRCS}) target_link_libraries(batchloader ${NETSNMP_LIBRARIES}) -set_target_properties(batchloader PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS batchloader DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS batchloader DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/cacheutils/CMakeLists.txt b/utils/cacheutils/CMakeLists.txt index bb8c766a6..20b85b71b 100644 --- a/utils/cacheutils/CMakeLists.txt +++ b/utils/cacheutils/CMakeLists.txt @@ -8,7 +8,5 @@ set(cacheutils_LIB_SRCS cacheutils.cpp) add_library(cacheutils SHARED ${cacheutils_LIB_SRCS}) -set_target_properties(cacheutils PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS cacheutils DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS cacheutils DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/cloudio/CMakeLists.txt b/utils/cloudio/CMakeLists.txt index 91f1d936f..5105f835e 100755 --- a/utils/cloudio/CMakeLists.txt +++ b/utils/cloudio/CMakeLists.txt @@ -9,9 +9,7 @@ add_library(cloudio SHARED ${cloudio_LIB_SRCS}) # we should be able to reverse the dependency like so: target_link_libraries(cloudio idbdatafile messageqcpp loggingcpp) -set_target_properties(cloudio PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS cloudio DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS cloudio DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) add_executable(cloudio_component_test component_test.cpp) diff --git a/utils/clusterTester/CMakeLists.txt b/utils/clusterTester/CMakeLists.txt index ef3830c3e..8d8a930b7 100644 --- a/utils/clusterTester/CMakeLists.txt +++ b/utils/clusterTester/CMakeLists.txt @@ -1,5 +1,5 @@ install(PROGRAMS columnstoreClusterTester.sh os_detect.sh - DESTINATION ${ENGINE_BINDIR} COMPONENT platform) - + DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) + diff --git a/utils/common/CMakeLists.txt b/utils/common/CMakeLists.txt index eff8be12f..17dac6385 100644 --- a/utils/common/CMakeLists.txt +++ b/utils/common/CMakeLists.txt @@ -15,8 +15,5 @@ add_library(common SHARED ${common_LIB_SRCS}) add_dependencies(common loggingcpp) - -set_target_properties(common PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS common DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS common DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/compress/CMakeLists.txt b/utils/compress/CMakeLists.txt index adf173c48..b2849b233 100644 --- a/utils/compress/CMakeLists.txt +++ b/utils/compress/CMakeLists.txt @@ -12,7 +12,5 @@ add_library(compress SHARED ${compress_LIB_SRCS}) target_link_libraries(compress ${SNAPPY_LIBRARIES}) -set_target_properties(compress PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS compress DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS compress DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/configcpp/CMakeLists.txt b/utils/configcpp/CMakeLists.txt index f52f2a84e..13f7b80aa 100644 --- a/utils/configcpp/CMakeLists.txt +++ b/utils/configcpp/CMakeLists.txt @@ -7,9 +7,7 @@ set(configcpp_LIB_SRCS configcpp.cpp xmlparser.cpp configstream.cpp) add_library(configcpp SHARED ${configcpp_LIB_SRCS}) -set_target_properties(configcpp PROPERTIES VERSION 1.0.0 SOVERSION 1) - target_compile_definitions(configcpp PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS) -install(TARGETS configcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS configcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/dataconvert/CMakeLists.txt b/utils/dataconvert/CMakeLists.txt index e9a11648d..8888b441b 100644 --- a/utils/dataconvert/CMakeLists.txt +++ b/utils/dataconvert/CMakeLists.txt @@ -8,6 +8,4 @@ set(dataconvert_LIB_SRCS dataconvert.cpp) add_library(dataconvert SHARED ${dataconvert_LIB_SRCS}) -set_target_properties(dataconvert PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS dataconvert DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS dataconvert DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/ddlcleanup/CMakeLists.txt b/utils/ddlcleanup/CMakeLists.txt index d15ba02b1..7569800f1 100644 --- a/utils/ddlcleanup/CMakeLists.txt +++ b/utils/ddlcleanup/CMakeLists.txt @@ -10,7 +10,5 @@ add_library(ddlcleanuputil SHARED ${ddlcleanuputil_LIB_SRCS}) target_link_libraries(ddlcleanuputil ${NETSNMP_LIBRARIES}) -set_target_properties(ddlcleanuputil PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS ddlcleanuputil DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS ddlcleanuputil DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/funcexp/CMakeLists.txt b/utils/funcexp/CMakeLists.txt index c83895a7b..acee44e8d 100644 --- a/utils/funcexp/CMakeLists.txt +++ b/utils/funcexp/CMakeLists.txt @@ -110,7 +110,5 @@ add_library(funcexp SHARED ${funcexp_LIB_SRCS}) target_link_libraries(funcexp ${NETSNMP_LIBRARIES}) -set_target_properties(funcexp PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS funcexp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS funcexp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/idbdatafile/CMakeLists.txt b/utils/idbdatafile/CMakeLists.txt index c8f63ad37..c61547ee1 100644 --- a/utils/idbdatafile/CMakeLists.txt +++ b/utils/idbdatafile/CMakeLists.txt @@ -19,6 +19,4 @@ target_link_libraries(idbdatafile ${NETSNMP_LIBRARIES} ${ENGINE_OAM_LIBS}) target_compile_definitions(idbdatafile PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS) -set_target_properties(idbdatafile PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS idbdatafile DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS idbdatafile DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/joiner/CMakeLists.txt b/utils/joiner/CMakeLists.txt index cc67192cf..dd2003a1d 100644 --- a/utils/joiner/CMakeLists.txt +++ b/utils/joiner/CMakeLists.txt @@ -8,8 +8,6 @@ set(joiner_LIB_SRCS joiner.cpp tuplejoiner.cpp joinpartition.cpp) add_library(joiner SHARED ${joiner_LIB_SRCS}) -set_target_properties(joiner PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS joiner DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS joiner DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/libmarias3/CMakeLists.txt b/utils/libmarias3/CMakeLists.txt index 4cbc50a95..8695dcefd 100644 --- a/utils/libmarias3/CMakeLists.txt +++ b/utils/libmarias3/CMakeLists.txt @@ -2,13 +2,13 @@ set(S3API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libmarias3 CACHE INTERNAL "S3API_DIR") find_package(Git QUIET) -if(GIT_FOUND) +if(GIT_FOUND AND EXISTS ${ENGINE_SRC_DIR}/.git) # Update submodules as needed option(GIT_SUBMODULE "Check submodules during build" ON) if(GIT_SUBMODULE) message(STATUS "Submodule update") execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + WORKING_DIRECTORY ${ENGINE_SRC_DIR} RESULT_VARIABLE GIT_SUBMOD_RESULT) if(NOT GIT_SUBMOD_RESULT EQUAL "0") message(FATAL_ERROR "git submodule update --init failed with ${GIT_SUBMOD_RESULT}, please checkout submodules") @@ -18,7 +18,7 @@ endif() include(ExternalProject) ExternalProject_Add(ms3 - DOWNLOAD_COMMAND cd ${CMAKE_SOURCE_DIR} && git submodule update --init + SOURCE_DIR ${S3API_DIR} CONFIGURE_COMMAND autoreconf -fi ${S3API_DIR} && ${S3API_DIR}/configure --enable-shared --disable-static --prefix=${CMAKE_BINARY_DIR} ${S3_CONFIGURE_OPT} BUILD_COMMAND make BUILD_IN_SOURCE 0 @@ -32,5 +32,5 @@ install(PROGRAMS ${CMAKE_BINARY_DIR}/lib/libmarias3.so.3 ${CMAKE_BINARY_DIR}/lib/libmarias3.so DESTINATION ${ENGINE_LIBDIR} - COMPONENT platform + COMPONENT columnstore-platform ) diff --git a/utils/libmysql_client/CMakeLists.txt b/utils/libmysql_client/CMakeLists.txt index 67da6461a..78324d632 100644 --- a/utils/libmysql_client/CMakeLists.txt +++ b/utils/libmysql_client/CMakeLists.txt @@ -7,7 +7,5 @@ set(libmysql_client_LIB_SRCS libmysql_client.cpp) add_library(libmysql_client SHARED ${libmysql_client_LIB_SRCS}) -set_target_properties(libmysql_client PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS libmysql_client DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS libmysql_client DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/loggingcpp/CMakeLists.txt b/utils/loggingcpp/CMakeLists.txt index b44cd8b21..491346529 100644 --- a/utils/loggingcpp/CMakeLists.txt +++ b/utils/loggingcpp/CMakeLists.txt @@ -26,9 +26,7 @@ add_library(loggingcpp SHARED -set_target_properties(loggingcpp PROPERTIES VERSION 1.0.0 SOVERSION 1) +install(TARGETS loggingcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) -install(TARGETS loggingcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) - -install(FILES MessageFile.txt ErrorMessage.txt DESTINATION ${ENGINE_SYSCONFDIR}/columnstore COMPONENT platform) +install(FILES MessageFile.txt ErrorMessage.txt DESTINATION ${ENGINE_SYSCONFDIR}/columnstore COMPONENT columnstore-platform) diff --git a/utils/messageqcpp/CMakeLists.txt b/utils/messageqcpp/CMakeLists.txt index 4f7c0e24c..149eb3847 100644 --- a/utils/messageqcpp/CMakeLists.txt +++ b/utils/messageqcpp/CMakeLists.txt @@ -16,6 +16,4 @@ set(messageqcpp_LIB_SRCS add_library(messageqcpp SHARED ${messageqcpp_LIB_SRCS}) -set_target_properties(messageqcpp PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS messageqcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS messageqcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/querystats/CMakeLists.txt b/utils/querystats/CMakeLists.txt index 0a8b6f5df..8057468b5 100644 --- a/utils/querystats/CMakeLists.txt +++ b/utils/querystats/CMakeLists.txt @@ -7,7 +7,5 @@ set(querystats_LIB_SRCS querystats.cpp) add_library(querystats SHARED ${querystats_LIB_SRCS}) -set_target_properties(querystats PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS querystats DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS querystats DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/querytele/CMakeLists.txt b/utils/querytele/CMakeLists.txt index 404c3fc73..d64a95163 100644 --- a/utils/querytele/CMakeLists.txt +++ b/utils/querytele/CMakeLists.txt @@ -14,7 +14,5 @@ set(querytele_LIB_SRCS add_library(querytele SHARED ${querytele_LIB_SRCS}) -set_target_properties(querytele PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS querytele DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS querytele DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/regr/CMakeLists.txt b/utils/regr/CMakeLists.txt index 0b858a917..7dca571f9 100755 --- a/utils/regr/CMakeLists.txt +++ b/utils/regr/CMakeLists.txt @@ -10,9 +10,7 @@ add_definitions(-DMYSQL_DYNAMIC_PLUGIN) add_library(regr SHARED ${regr_LIB_SRCS} ) -set_target_properties(regr PROPERTIES VERSION 1.1.0 SOVERSION 1) - -install(TARGETS regr DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS regr DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) @@ -20,7 +18,5 @@ set(regr_mysql_LIB_SRCS regrmysql.cpp modamysql.cpp) add_library(regr_mysql SHARED ${regr_mysql_LIB_SRCS}) -set_target_properties(regr_mysql PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS regr_mysql DESTINATION ${MARIADB_PLUGINDIR} COMPONENT storage-engine) +install(TARGETS regr_mysql DESTINATION ${MARIADB_PLUGINDIR} COMPONENT columnstore-engine) diff --git a/utils/rowgroup/CMakeLists.txt b/utils/rowgroup/CMakeLists.txt index 028fa2a67..f79e757aa 100644 --- a/utils/rowgroup/CMakeLists.txt +++ b/utils/rowgroup/CMakeLists.txt @@ -12,7 +12,5 @@ add_library(rowgroup SHARED ${rowgroup_LIB_SRCS}) target_link_libraries(rowgroup ${NETSNMP_LIBRARIES} funcexp) -set_target_properties(rowgroup PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS rowgroup DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS rowgroup DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/rwlock/CMakeLists.txt b/utils/rwlock/CMakeLists.txt index a6201d40f..fcde11218 100644 --- a/utils/rwlock/CMakeLists.txt +++ b/utils/rwlock/CMakeLists.txt @@ -9,7 +9,5 @@ set(rwlock_LIB_SRCS rwlock.cpp rwlock_local.cpp) add_library(rwlock SHARED ${rwlock_LIB_SRCS}) -set_target_properties(rwlock PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS rwlock DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS rwlock DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/threadpool/CMakeLists.txt b/utils/threadpool/CMakeLists.txt index 47a09d88b..6939047b9 100644 --- a/utils/threadpool/CMakeLists.txt +++ b/utils/threadpool/CMakeLists.txt @@ -8,6 +8,4 @@ set(threadpool_LIB_SRCS weightedthreadpool.cpp threadpool.cpp prioritythreadpool add_library(threadpool SHARED ${threadpool_LIB_SRCS}) -set_target_properties(threadpool PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS threadpool DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS threadpool DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/thrift/CMakeLists.txt b/utils/thrift/CMakeLists.txt index 1521cb617..d5c9a29af 100644 --- a/utils/thrift/CMakeLists.txt +++ b/utils/thrift/CMakeLists.txt @@ -16,7 +16,5 @@ add_definitions(-DTHRIFT_SQUELCH_CONSOLE_OUTPUT) add_library(thrift SHARED ${thrift_LIB_SRCS}) -set_target_properties(thrift PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS thrift DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS thrift DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/udfsdk/CMakeLists.txt b/utils/udfsdk/CMakeLists.txt index 053725698..016e7d892 100755 --- a/utils/udfsdk/CMakeLists.txt +++ b/utils/udfsdk/CMakeLists.txt @@ -10,9 +10,7 @@ add_definitions(-DMYSQL_DYNAMIC_PLUGIN) add_library(udfsdk SHARED ${udfsdk_LIB_SRCS}) -set_target_properties(udfsdk PROPERTIES VERSION 1.1.0 SOVERSION 1) - -install(TARGETS udfsdk DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS udfsdk DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) @@ -20,7 +18,5 @@ set(udf_mysql_LIB_SRCS udfmysql.cpp) add_library(udf_mysql SHARED ${udf_mysql_LIB_SRCS}) -set_target_properties(udf_mysql PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS udf_mysql DESTINATION ${MARIADB_PLUGINDIR} COMPONENT storage-engine) +install(TARGETS udf_mysql DESTINATION ${MARIADB_PLUGINDIR} COMPONENT columnstore-engine) diff --git a/utils/windowfunction/CMakeLists.txt b/utils/windowfunction/CMakeLists.txt index 77e4e86d3..9298cd1f3 100755 --- a/utils/windowfunction/CMakeLists.txt +++ b/utils/windowfunction/CMakeLists.txt @@ -26,12 +26,10 @@ set(windowfunction_LIB_SRCS add_library(windowfunction SHARED ${windowfunction_LIB_SRCS}) -set_target_properties(windowfunction PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS windowfunction DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS windowfunction DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) if (WITH_SORTING_COMPARATORS_UT) add_executable(comparators_tests comparators-tests.cpp) target_link_libraries(comparators_tests ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${CPPUNIT_LIBRARIES} cppunit) - install(TARGETS comparators_tests DESTINATION ${ENGINE_BINDIR} COMPONENT platform) + install(TARGETS comparators_tests DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) endif() diff --git a/versioning/BRM/CMakeLists.txt b/versioning/BRM/CMakeLists.txt index 8182ffc33..feda0c245 100644 --- a/versioning/BRM/CMakeLists.txt +++ b/versioning/BRM/CMakeLists.txt @@ -32,9 +32,7 @@ set(brm_LIB_SRCS add_library(brm SHARED ${brm_LIB_SRCS}) -set_target_properties(brm PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS brm DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS brm DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) ########### next target ############### @@ -45,7 +43,7 @@ add_executable(controllernode ${controllernode_SRCS}) target_link_libraries(controllernode ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ) -install(TARGETS controllernode DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS controllernode DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -56,7 +54,7 @@ add_executable(workernode ${workernode_SRCS}) target_link_libraries(workernode ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS workernode DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS workernode DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -67,7 +65,7 @@ add_executable(dbrmctl ${dbrmctl_SRCS}) target_link_libraries(dbrmctl ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS dbrmctl DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS dbrmctl DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -78,7 +76,7 @@ add_executable(reset_locks ${reset_locks_SRCS}) target_link_libraries(reset_locks ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES}) -install(TARGETS reset_locks DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS reset_locks DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -89,7 +87,7 @@ add_executable(rollback ${rollback_SRCS}) target_link_libraries(rollback ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES}) -install(TARGETS rollback DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS rollback DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -100,7 +98,7 @@ add_executable(save_brm ${save_brm_SRCS}) target_link_libraries(save_brm ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES}) -install(TARGETS save_brm DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS save_brm DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -111,5 +109,5 @@ add_executable(load_brm ${load_brm_SRCS}) target_link_libraries(load_brm ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES}) -install(TARGETS load_brm DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS load_brm DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/writeengine/bulk/CMakeLists.txt b/writeengine/bulk/CMakeLists.txt index bd1d83f29..dfc0e6fba 100644 --- a/writeengine/bulk/CMakeLists.txt +++ b/writeengine/bulk/CMakeLists.txt @@ -40,5 +40,5 @@ add_executable(cpimport.bin ${cpimport.bin_SRCS}) add_dependencies(cpimport.bin marias3) target_link_libraries(cpimport.bin ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${S3API_DEPS} we_bulk we_xml) -install(TARGETS cpimport.bin DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS cpimport.bin DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/writeengine/client/CMakeLists.txt b/writeengine/client/CMakeLists.txt index 2133e1632..431dd5583 100644 --- a/writeengine/client/CMakeLists.txt +++ b/writeengine/client/CMakeLists.txt @@ -10,8 +10,6 @@ add_library(writeengineclient SHARED ${writeengineclient_LIB_SRCS}) target_link_libraries(writeengineclient ${NETSNMP_LIBRARIES}) -set_target_properties(writeengineclient PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS writeengineclient DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS writeengineclient DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/writeengine/redistribute/CMakeLists.txt b/writeengine/redistribute/CMakeLists.txt index 22308ced0..f53add736 100644 --- a/writeengine/redistribute/CMakeLists.txt +++ b/writeengine/redistribute/CMakeLists.txt @@ -13,10 +13,8 @@ add_library(writeengineredistribute SHARED ${writeengineredistribute_LIB_SRCS}) target_link_libraries(writeengineredistribute ${NETSNMP_LIBRARIES}) -set_target_properties(writeengineredistribute PROPERTIES VERSION 1.0.0 SOVERSION 1) - target_compile_definitions(writeengineredistribute PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS) -install(TARGETS writeengineredistribute DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS writeengineredistribute DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/writeengine/server/CMakeLists.txt b/writeengine/server/CMakeLists.txt index cb11ff375..7629eaf64 100644 --- a/writeengine/server/CMakeLists.txt +++ b/writeengine/server/CMakeLists.txt @@ -21,5 +21,5 @@ add_executable(WriteEngineServer ${WriteEngineServer_SRCS}) target_link_libraries(WriteEngineServer ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS} threadpool writeengineredistribute) -install(TARGETS WriteEngineServer DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS WriteEngineServer DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/writeengine/shared/CMakeLists.txt b/writeengine/shared/CMakeLists.txt index 898da28a0..0e62b7bef 100644 --- a/writeengine/shared/CMakeLists.txt +++ b/writeengine/shared/CMakeLists.txt @@ -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 ############### diff --git a/writeengine/splitter/CMakeLists.txt b/writeengine/splitter/CMakeLists.txt index 09aca8542..c02645534 100644 --- a/writeengine/splitter/CMakeLists.txt +++ b/writeengine/splitter/CMakeLists.txt @@ -19,5 +19,5 @@ add_executable(cpimport ${cpimport_SRCS}) target_link_libraries(cpimport ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} batchloader threadpool) -install(TARGETS cpimport DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS cpimport DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/writeengine/wrapper/CMakeLists.txt b/writeengine/wrapper/CMakeLists.txt index 205e3cd77..8d9266c90 100644 --- a/writeengine/wrapper/CMakeLists.txt +++ b/writeengine/wrapper/CMakeLists.txt @@ -41,6 +41,4 @@ add_library(writeengine SHARED ${writeengine_LIB_SRCS}) target_link_libraries(writeengine ${NETSNMP_LIBRARIES}) -set_target_properties(writeengine PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS writeengine DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS writeengine DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)