diff --git a/CMakeLists.txt b/CMakeLists.txt index 161f3303f..093fb1f93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,8 @@ include(check_compiler_flag) include(ExternalProject) include(CheckCXXSourceCompiles) include(packages) +include(boost) +include(thrift) include(dirs) include(includes) include(libs) @@ -45,9 +47,6 @@ include(columnstore_version) include(configureEngine) include(compiler_flags) include(misc) -include(boost) -include(thrift) -include(ColumnstoreLibrary) set(COMPONENTS dbcon/mysql diff --git a/build/bootstrap_mcs.sh b/build/bootstrap_mcs.sh index ba35528d3..dcc66204b 100755 --- a/build/bootstrap_mcs.sh +++ b/build/bootstrap_mcs.sh @@ -38,34 +38,34 @@ cd - >/dev/null echo "Arguments received: $@" message "Building Mariadb Server from $color_yellow$MDB_SOURCE_PATH$color_normal" -optparse.define short=t long=build-type desc="Build Type: ${BUILD_TYPE_OPTIONS[*]}" variable=MCS_BUILD_TYPE +optparse.define short=A long=asan desc="Build with ASAN" variable=ASAN default=false value=true +optparse.define short=a long=build-path variable=MARIA_BUILD_PATH default="$MDB_SOURCE_PATH"/../MariaDBBuild +optparse.define short=B long=run-microbench desc="Compile and run microbenchmarks " variable=RUN_BENCHMARKS default=false value=true +optparse.define short=c long=cloud desc="Enable cloud storage" variable=CLOUD_STORAGE_ENABLED default=false value=true +optparse.define short=C long=force-cmake-reconfig desc="Force cmake reconfigure" variable=FORCE_CMAKE_CONFIG default=false value=true optparse.define short=d long=distro desc="Choose your OS: ${DISTRO_OPTIONS[*]}" variable=OS optparse.define short=D long=install-deps desc="Install dependences" variable=INSTALL_DEPS default=false value=true -optparse.define short=C long=force-cmake-reconfig desc="Force cmake reconfigure" variable=FORCE_CMAKE_CONFIG default=false value=true -optparse.define short=S long=skip-columnstore-submodules desc="Skip columnstore submodules initialization" variable=SKIP_SUBMODULES default=false value=true -optparse.define short=u long=skip-unit-tests desc="Skip UnitTests" variable=SKIP_UNIT_TESTS default=false value=true -optparse.define short=B long=run-microbench desc="Compile and run microbenchmarks " variable=RUN_BENCHMARKS default=false value=true -optparse.define short=W long=without-core-dumps desc="Do not produce core dumps" variable=WITHOUT_COREDUMPS default=false value=true -optparse.define short=v long=verbose desc="Verbose makefile commands" variable=MAKEFILE_VERBOSE default=false value=true -optparse.define short=A long=asan desc="Build with ASAN" variable=ASAN default=false value=true -optparse.define short=T long=tsan desc="Build with TSAN" variable=TSAN default=false value=true -optparse.define short=U long=ubsan desc="Build with UBSAN" variable=UBSAN default=false value=true -optparse.define short=P long=report-path desc="Path for storing reports and profiles" variable=REPORT_PATH default="/core" -optparse.define short=N long=ninja desc="Build with ninja" variable=USE_NINJA default=false value=true -optparse.define short=G long=draw-deps desc="Draw dependencies graph" variable=DRAW_DEPS default=false value=true -optparse.define short=M long=skip-smoke desc="Skip final smoke test" variable=SKIP_SMOKE default=false value=true -optparse.define short=n long=no-clean-install desc="Do not perform a clean install (keep existing db files)" variable=NO_CLEAN default=false value=true -optparse.define short=j long=parallel desc="Number of paralles for build" variable=CPUS default=$(getconf _NPROCESSORS_ONLN) -optparse.define short=F long=show-build-flags desc="Print CMake flags, while build" variable=PRINT_CMAKE_FLAGS default=false value=true -optparse.define short=c long=cloud desc="Enable cloud storage" variable=CLOUD_STORAGE_ENABLED default=false value=true +optparse.define short=F long=custom-cmake-flags desc="Add custom cmake flags" variable=CUSTOM_CMAKE_FLAGS optparse.define short=f long=do-not-freeze-revision desc="Disable revision freezing, or do not set 'update none' for columnstore submodule in MDB repository" variable=DO_NOT_FREEZE_REVISION default=false value=true -optparse.define short=a long=build-path variable=MARIA_BUILD_PATH default="$MDB_SOURCE_PATH"/../MariaDBBuild -optparse.define short=O long=static desc="Build all with static libraries" variable=STATIC_BUILD default=false value=true +optparse.define short=G long=draw-deps desc="Draw dependencies graph" variable=DRAW_DEPS default=false value=true +optparse.define short=j long=parallel desc="Number of paralles for build" variable=CPUS default=$(getconf _NPROCESSORS_ONLN) +optparse.define short=M long=skip-smoke desc="Skip final smoke test" variable=SKIP_SMOKE default=false value=true +optparse.define short=N long=ninja desc="Build with ninja" variable=USE_NINJA default=false value=true +optparse.define short=n long=no-clean-install desc="Do not perform a clean install (keep existing db files)" variable=NO_CLEAN default=false value=true optparse.define short=o long=recompile-only variable=RECOMPILE_ONLY default=false value=true -optparse.define short=r long=restart-services variable=RESTART_SERVICES default=true value=false -optparse.define short=s long=sccache desc="Build with sccache" variable=SCCACHE default=false value=true +optparse.define short=O long=static desc="Build all with static libraries" variable=STATIC_BUILD default=false value=true optparse.define short=p long=build-packages desc="Build packages" variable=BUILD_PACKAGES default=false value=true +optparse.define short=P long=report-path desc="Path for storing reports and profiles" variable=REPORT_PATH default="/core" +optparse.define short=r long=restart-services variable=RESTART_SERVICES default=true value=false optparse.define short=R long=server-version desc="MariaDB server version" variable=MARIADB_SERVER_VERSION +optparse.define short=s long=sccache desc="Build with sccache" variable=SCCACHE default=false value=true +optparse.define short=S long=skip-columnstore-submodules desc="Skip columnstore submodules initialization" variable=SKIP_SUBMODULES default=false value=true +optparse.define short=t long=build-type desc="Build Type: ${BUILD_TYPE_OPTIONS[*]}" variable=MCS_BUILD_TYPE +optparse.define short=T long=tsan desc="Build with TSAN" variable=TSAN default=false value=true +optparse.define short=u long=skip-unit-tests desc="Skip UnitTests" variable=SKIP_UNIT_TESTS default=false value=true +optparse.define short=U long=ubsan desc="Build with UBSAN" variable=UBSAN default=false value=true +optparse.define short=v long=verbose desc="Verbose makefile commands" variable=MAKEFILE_VERBOSE default=false value=true +optparse.define short=W long=without-core-dumps desc="Do not produce core dumps" variable=WITHOUT_COREDUMPS default=false value=true source $(optparse.build) @@ -369,10 +369,10 @@ construct_cmake_flags() { MDB_CMAKE_FLAGS+=(-DDEB=${CODENAME}) fi - if [[ $PRINT_CMAKE_FLAGS = true ]]; then - message "Building with flags" - newline_array "${MDB_CMAKE_FLAGS[@]}" - fi + MDB_CMAKE_FLAGS+=($CUSTOM_CMAKE_FLAGS) + + message "Building with flags" + newline_array "${MDB_CMAKE_FLAGS[@]}" } init_submodules() { diff --git a/cmapi/CMakeLists.txt b/cmapi/CMakeLists.txt index aa89742e4..8b6a6b27d 100644 --- a/cmapi/CMakeLists.txt +++ b/cmapi/CMakeLists.txt @@ -1,32 +1,31 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.11) +cmake_minimum_required(VERSION 3.11) -STRING(TIMESTAMP CURRENT_YEAR "%Y") +string(TIMESTAMP CURRENT_YEAR "%Y") -PROJECT(cmapi NONE) - -SET(CPACK_PACKAGE_NAME "MariaDB-columnstore-cmapi") +project(cmapi NONE) +set(CPACK_PACKAGE_NAME "MariaDB-columnstore-cmapi") # use columnstore package versioning -SET(CMAPI "YES") -LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) -MESSAGE(STATUS "GET SERVER_DIR from input argument ${SERVER_DIR}") -SET(SERVER_SOURCE_DIR "${SERVER_DIR}") -INCLUDE(cmapi_misc) +set(CMAPI "YES") +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) +message(STATUS "GET SERVER_DIR from input argument ${SERVER_DIR}") +set(SERVER_SOURCE_DIR "${SERVER_DIR}") +include(cmapi_misc) # Get mysql version -GET_MYSQL_VERSION() +get_mysql_version() # get CMAPI version from Columnstore version -SET(ENGINE_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..) -LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../cmake) -INCLUDE(columnstore_version) +set(ENGINE_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../cmake) +include(columnstore_version) +set(CMAPI_PACKAGE_VERSION "${CMAPI_VERSION_MAJOR}.${CMAPI_VERSION_MINOR}.${CMAPI_VERSION_PATCH}") -SET(CMAPI_PACKAGE_VERSION "${CMAPI_VERSION_MAJOR}.${CMAPI_VERSION_MINOR}.${CMAPI_VERSION_PATCH}") +set(CMAPI_USER "root") -SET(CMAPI_USER "root") - -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MariaDB ColumnStore CMAPI: cluster management API and command line tool.") -SET(CPACK_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY} +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MariaDB ColumnStore CMAPI: cluster management API and command line tool.") +set(CPACK_PACKAGE_DESCRIPTION + "${CPACK_PACKAGE_DESCRIPTION_SUMMARY} It is GPL v2 licensed, which means you can use the it free of charge under the conditions of the GNU General Public License Version 2 (http://www.gnu.org/licenses/). @@ -34,165 +33,188 @@ conditions of the GNU General Public License Version 2 (http://www.gnu.org/licen MariaDB documentation can be found at https://mariadb.com/kb MariaDB bug reports should be submitted through https://jira.mariadb.org -") -SET(CPACK_PACKAGE_URL "http://www.mariadb.com") -SET(CPACK_PACKAGE_CONTACT "MariaDB Corporation Ab") -SET(CPACK_PACKAGE_SUMMARY "MariaDB ColumnStore CMAPI: cluster management API and command line tool.") -SET(CPACK_PACKAGE_VENDOR "MariaDB Corporation Ab") -SET(CPACK_PACKAGE_LICENSE "Copyright (c) ${CURRENT_YEAR} MariaDB Corporation Ab.; redistributable under the terms of the GPLv2, see the file LICENSE.GPL2 for details.") +" +) +set(CPACK_PACKAGE_URL "http://www.mariadb.com") +set(CPACK_PACKAGE_CONTACT "MariaDB Corporation Ab") +set(CPACK_PACKAGE_SUMMARY "MariaDB ColumnStore CMAPI: cluster management API and command line tool.") +set(CPACK_PACKAGE_VENDOR "MariaDB Corporation Ab") +set(CPACK_PACKAGE_LICENSE + "Copyright (c) ${CURRENT_YEAR} MariaDB Corporation Ab.; redistributable under the terms of the GPLv2, see the file LICENSE.GPL2 for details." +) -SET(BIN_DIR "/usr/bin") -SET(ETC_DIR "/etc/columnstore") -SET(SHARE_DIR "/usr/share/columnstore") -SET(CMAPI_DIR "${SHARE_DIR}/cmapi") -SET(SYSTEMD_UNIT_DIR "/usr/lib/systemd/system") -SET(SYSTEMD_ENGINE_UNIT_NAME "mariadb-columnstore") -SET(CMAPI_CONF_FILEPATH "${ETC_DIR}/cmapi_server.conf") -SET(MAN_DIR "/usr/share/man/man1") +set(BIN_DIR "/usr/bin") +set(ETC_DIR "/etc/columnstore") +set(SHARE_DIR "/usr/share/columnstore") +set(CMAPI_DIR "${SHARE_DIR}/cmapi") +set(SYSTEMD_UNIT_DIR "/usr/lib/systemd/system") +set(SYSTEMD_ENGINE_UNIT_NAME "mariadb-columnstore") +set(CMAPI_CONF_FILEPATH "${ETC_DIR}/cmapi_server.conf") +set(MAN_DIR "/usr/share/man/man1") -STRING(TOLOWER ${CPACK_PACKAGE_NAME} SYSTEMD_UNIT_NAME) +string(TOLOWER ${CPACK_PACKAGE_NAME} SYSTEMD_UNIT_NAME) -CONFIGURE_FILE(VERSION.template VERSION) -CONFIGURE_FILE(service.template ${SYSTEMD_UNIT_NAME}.service) -CONFIGURE_FILE(systemd.env.template systemd.env) -CONFIGURE_FILE(postinst.template postinst) -CONFIGURE_FILE(prerm.template prerm) -CONFIGURE_FILE(conffiles.template conffiles) -CONFIGURE_FILE(mcs.template mcs) -CONFIGURE_FILE(mcs_aws.template mcs_aws) -CONFIGURE_FILE(mcs_gsutil.template mcs_gsutil) +configure_file(VERSION.template VERSION) +configure_file(service.template ${SYSTEMD_UNIT_NAME}.service) +configure_file(systemd.env.template systemd.env) +configure_file(postinst.template postinst) +configure_file(prerm.template prerm) +configure_file(conffiles.template conffiles) +configure_file(mcs.template mcs) +configure_file(mcs_aws.template mcs_aws) +configure_file(mcs_gsutil.template mcs_gsutil) -INSTALL(DIRECTORY python deps mcs_node_control failover cmapi_server engine_files mcs_cluster_tool - DESTINATION ${CMAPI_DIR} - USE_SOURCE_PERMISSIONS - PATTERN "test" EXCLUDE - PATTERN "cmapi_server.conf" EXCLUDE - PATTERN "README" EXCLUDE) -INSTALL(FILES LICENSE.GPL2 VERSION - DESTINATION ${CMAPI_DIR}) -INSTALL(FILES check_ready.sh - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ - DESTINATION ${CMAPI_DIR}) -INSTALL(FILES cmapi_server/cmapi_server.conf systemd.env - DESTINATION ${ETC_DIR}) -INSTALL(FILES ${SYSTEMD_UNIT_NAME}.service - DESTINATION ${SYSTEMD_UNIT_DIR}) -INSTALL(FILES mcs - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ - DESTINATION ${BIN_DIR}) -INSTALL(FILES mcs_aws - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ - DESTINATION ${BIN_DIR}) -INSTALL(FILES mcs_gsutil - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ - DESTINATION ${BIN_DIR}) -INSTALL(FILES scripts/mcs_backup_manager.sh scripts/cs_package_manager.sh scripts/columnstore_review.sh - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ - DESTINATION ${BIN_DIR}) -INSTALL(FILES mcs_cluster_tool/mcs.1 DESTINATION ${MAN_DIR}) +install( + DIRECTORY python + deps + mcs_node_control + failover + cmapi_server + engine_files + mcs_cluster_tool + DESTINATION ${CMAPI_DIR} + USE_SOURCE_PERMISSIONS + PATTERN "test" EXCLUDE + PATTERN "cmapi_server.conf" EXCLUDE + PATTERN "README" EXCLUDE +) +install(FILES LICENSE.GPL2 VERSION DESTINATION ${CMAPI_DIR}) +install( + FILES check_ready.sh + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ + DESTINATION ${CMAPI_DIR} +) +install(FILES cmapi_server/cmapi_server.conf systemd.env DESTINATION ${ETC_DIR}) +install(FILES ${SYSTEMD_UNIT_NAME}.service DESTINATION ${SYSTEMD_UNIT_DIR}) +install( + FILES mcs + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ + DESTINATION ${BIN_DIR} +) +install( + FILES mcs_aws + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ + DESTINATION ${BIN_DIR} +) +install( + FILES mcs_gsutil + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ + DESTINATION ${BIN_DIR} +) +install( + FILES scripts/mcs_backup_manager.sh scripts/cs_package_manager.sh scripts/columnstore_review.sh + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ + DESTINATION ${BIN_DIR} +) +install(FILES mcs_cluster_tool/mcs.1 DESTINATION ${MAN_DIR}) -OPTION(RPM "Build an RPM" OFF) -IF(RPM) - SET(CPACK_GENERATOR "RPM") - # cmake wants to byte-compile all .py files. - # this line below will prevent it of doing such - # trying to byte-compile could produce some issues with not existing - # python3 on some systems like centos7 - # more info: +option(RPM "Build an RPM" OFF) +if(RPM) + set(CPACK_GENERATOR "RPM") + # cmake wants to byte-compile all .py files. this line below will prevent it of doing such trying to byte-compile + # could produce some issues with not existing python3 on some systems like centos7 more info: # https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation#Status_quo # https://stackoverflow.com/questions/69988093/cmake-brp-python-bytecompile-and-python3 - SET(CPACK_RPM_SPEC_INSTALL_POST "%global _python_bytecompile_extra 0") - SET(CPACK_RPM_SPEC_MORE_DEFINE "%global _python_bytecompile_extra 0") - # Turn off the brp-python-bytecompile script - # for every release including EPEL - # more info here: + set(CPACK_RPM_SPEC_INSTALL_POST "%global _python_bytecompile_extra 0") + set(CPACK_RPM_SPEC_MORE_DEFINE "%global _python_bytecompile_extra 0") + # Turn off the brp-python-bytecompile script for every release including EPEL more info here: # https://pagure.io/packaging-committee/issue/755 - SET(CPACK_RPM_SPEC_INSTALL_POST "%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')") - SET(CPACK_RPM_SPEC_MORE_DEFINE "%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')") - # otherwise it could be solved to install python3 in centos7 and adding this line: - # SET(CPACK_RPM_SPEC_MORE_DEFINE "%define __python %{__python3}") - # example here: - # https://github.com/irods/irods/pull/6347/files - # but it's doesn't work because of some CPACK versions don't add definitions - # to the spec file using CPACK_RPM_SPEC_MORE_DEFINE + set(CPACK_RPM_SPEC_INSTALL_POST + "%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')" + ) + set(CPACK_RPM_SPEC_MORE_DEFINE + "%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')" + ) + # otherwise it could be solved to install python3 in centos7 and adding this line: SET(CPACK_RPM_SPEC_MORE_DEFINE + # "%define __python %{__python3}") example here: https://github.com/irods/irods/pull/6347/files but it's doesn't + # work because of some CPACK versions don't add definitions to the spec file using CPACK_RPM_SPEC_MORE_DEFINE - SET(CPACK_RPM_PACKAGE_NAME ${CPACK_PACKAGE_NAME}) + set(CPACK_RPM_PACKAGE_NAME ${CPACK_PACKAGE_NAME}) - SET(CPACK_RPM_PACKAGE_LICENSE "GPLv2") - SET(CPACK_RPM_PACKAGE_GROUP "Applications/Databases") - SET(CPACK_RPM_PACKAGE_URL ${CPACK_PACKAGE_URL}) - SET(CPACK_RPM_PACKAGE_SUMMARY ${CPACK_PACKAGE_SUMMARY}) - SET(CPACK_RPM_PACKAGE_VENDOR ${CPACK_PACKAGE_VENDOR}) - SET(CPACK_RPM_PACKAGE_LICENSE ${CPACK_PACKAGE_LICENSE}) - SET(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}) + set(CPACK_RPM_PACKAGE_LICENSE "GPLv2") + set(CPACK_RPM_PACKAGE_GROUP "Applications/Databases") + set(CPACK_RPM_PACKAGE_URL ${CPACK_PACKAGE_URL}) + set(CPACK_RPM_PACKAGE_SUMMARY ${CPACK_PACKAGE_SUMMARY}) + set(CPACK_RPM_PACKAGE_VENDOR ${CPACK_PACKAGE_VENDOR}) + set(CPACK_RPM_PACKAGE_LICENSE ${CPACK_PACKAGE_LICENSE}) + set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}) - SET(CPACK_RPM_SPEC_MORE_DEFINE "%undefine __brp_mangle_shebangs") - SET(CPACK_RPM_PACKAGE_AUTOREQ "no") + set(CPACK_RPM_SPEC_MORE_DEFINE "%undefine __brp_mangle_shebangs") + set(CPACK_RPM_PACKAGE_AUTOREQ "no") - SET(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/postinst) - SET(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/prerm) - SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION ${ETC_DIR} ${SHARE_DIR}) - SET(CPACK_RPM_USER_FILELIST "%config(noreplace) ${CMAPI_CONF_FILEPATH}") + set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/postinst) + set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/prerm) + set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION ${ETC_DIR} ${SHARE_DIR}) + set(CPACK_RPM_USER_FILELIST "%config(noreplace) ${CMAPI_CONF_FILEPATH}") - SET(CPACK_RPM_PACKAGE_OBSOLETES "mariadb-columnstore-cmapi") - SET(CPACK_RPM_PACKAGE_REQUIRES "curl") - STRING(REPLACE "-" "_" SERVER_VERSION ${SERVER_VERSION}) + set(CPACK_RPM_PACKAGE_OBSOLETES "mariadb-columnstore-cmapi") + set(CPACK_RPM_PACKAGE_REQUIRES "curl") + string(REPLACE "-" "_" SERVER_VERSION ${SERVER_VERSION}) get_linux_lsb_release_information() - STRING(REGEX MATCH "^." OS_VERSION_MAJOR "${LSB_RELEASE_VERSION_SHORT}") - MESSAGE(STATUS ${OS_VERSION_MAJOR}) - IF (LSB_RELEASE_ID_SHORT MATCHES "centos|rocky|rhel|alma|RedHatEnterprise") - SET(OS_NAME_SHORT "el") - IF (OS_VERSION_MAJOR MATCHES "9") - SET(CPACK_RPM_PACKAGE_REQUIRES "libxcrypt-compat") - ENDIF() - ELSE() - SET(OS_NAME_SHORT "unknown") - ENDIF() - SET(OS_VERSION "${OS_NAME_SHORT}${OS_VERSION_MAJOR}") - MESSAGE(STATUS "OS_VERSION ${OS_VERSION}") + string(REGEX MATCH "^." OS_VERSION_MAJOR "${LSB_RELEASE_VERSION_SHORT}") + message(STATUS ${OS_VERSION_MAJOR}) + if(LSB_RELEASE_ID_SHORT MATCHES "centos|rocky|rhel|alma|RedHatEnterprise") + set(OS_NAME_SHORT "el") + if(OS_VERSION_MAJOR MATCHES "9") + set(CPACK_RPM_PACKAGE_REQUIRES "libxcrypt-compat") + endif() + else() + set(OS_NAME_SHORT "unknown") + endif() + set(OS_VERSION "${OS_NAME_SHORT}${OS_VERSION_MAJOR}") + message(STATUS "OS_VERSION ${OS_VERSION}") - SET(CPACK_RPM_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${SERVER_VERSION}_${CMAPI_PACKAGE_VERSION}-${CMAPI_VERSION_RELEASE}.${OS_VERSION}.${CMAKE_HOST_SYSTEM_PROCESSOR}") - MESSAGE(STATUS "CPACK_RPM_PACKAGE_FILE_NAME ${CPACK_RPM_PACKAGE_FILE_NAME}") - SET(CPACK_PACKAGE_FILE_NAME ${CPACK_RPM_PACKAGE_FILE_NAME}) + set(CPACK_RPM_PACKAGE_FILE_NAME + "${CPACK_PACKAGE_NAME}-${SERVER_VERSION}_${CMAPI_PACKAGE_VERSION}-${CMAPI_VERSION_RELEASE}.${OS_VERSION}.${CMAKE_HOST_SYSTEM_PROCESSOR}" + ) + message(STATUS "CPACK_RPM_PACKAGE_FILE_NAME ${CPACK_RPM_PACKAGE_FILE_NAME}") + set(CPACK_PACKAGE_FILE_NAME ${CPACK_RPM_PACKAGE_FILE_NAME}) # version and release the same as in Columnstore engine package - SET(CPACK_RPM_PACKAGE_VERSION "${SERVER_VERSION}_${CMAPI_PACKAGE_VERSION}") - SET(CPACK_RPM_PACKAGE_RELEASE "${CMAPI_VERSION_RELEASE}.${OS_VERSION}") -ENDIF() + set(CPACK_RPM_PACKAGE_VERSION "${SERVER_VERSION}_${CMAPI_PACKAGE_VERSION}") + set(CPACK_RPM_PACKAGE_RELEASE "${CMAPI_VERSION_RELEASE}.${OS_VERSION}") +endif() -OPTION(DEB "Build a DEB" OFF) -IF(DEB) - SET(CPACK_GENERATOR "DEB") +option(DEB "Build a DEB" OFF) +if(DEB) + set(CPACK_GENERATOR "DEB") # TODO: different names in deb and rpm packages, fix it in next releases. - STRING(TOLOWER ${CPACK_PACKAGE_NAME} CPACK_DEBIAN_PACKAGE_NAME) - STRING(TOLOWER ${CPACK_PACKAGE_NAME} CPACK_PACKAGE_NAME) - SET(CPACK_DEBIAN_PACKAGE_LICENSE "GPLv2") - SET(CPACK_DEBIAN_PACKAGE_URL ${CPACK_PACKAGE_URL}) - SET(CPACK_DEBIAN_PACKAGE_SUMMARY ${CPACK_PACKAGE_SUMMARY}) - SET(CPACK_DEBIAN_PACKAGE_VENDOR ${CPACK_PACKAGE_VENDOR}) - SET(CPACK_DEBIAN_PACKAGE_LICENSE ${CPACK_PACKAGE_LICENSE}) - SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}) + string(TOLOWER ${CPACK_PACKAGE_NAME} CPACK_DEBIAN_PACKAGE_NAME) + string(TOLOWER ${CPACK_PACKAGE_NAME} CPACK_PACKAGE_NAME) + set(CPACK_DEBIAN_PACKAGE_LICENSE "GPLv2") + set(CPACK_DEBIAN_PACKAGE_URL ${CPACK_PACKAGE_URL}) + set(CPACK_DEBIAN_PACKAGE_SUMMARY ${CPACK_PACKAGE_SUMMARY}) + set(CPACK_DEBIAN_PACKAGE_VENDOR ${CPACK_PACKAGE_VENDOR}) + set(CPACK_DEBIAN_PACKAGE_LICENSE ${CPACK_PACKAGE_LICENSE}) + set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}) - SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/prerm;${CMAKE_CURRENT_SOURCE_DIR}/postinst;${CMAKE_CURRENT_SOURCE_DIR}/conffiles") + set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA + "${CMAKE_CURRENT_SOURCE_DIR}/prerm;${CMAKE_CURRENT_SOURCE_DIR}/postinst;${CMAKE_CURRENT_SOURCE_DIR}/conffiles" + ) - SET(CPACK_DEBIAN_PACKAGE_REPLACES "mariadb-columnstore-cmapi") - SET(CPACK_DEBIAN_PACKAGE_DEPENDS "curl") - STRING(REPLACE "-" "." SERVER_VERSION ${SERVER_VERSION}) - SET(PATCHLEVEL "+maria") + set(CPACK_DEBIAN_PACKAGE_REPLACES "mariadb-columnstore-cmapi") + set(CPACK_DEBIAN_PACKAGE_DEPENDS "curl") + string(REPLACE "-" "." SERVER_VERSION ${SERVER_VERSION}) + set(PATCHLEVEL "+maria") get_linux_lsb_release_information() - STRING(REGEX MATCH "^..." LSBID ${LSB_RELEASE_ID_SHORT}) - MESSAGE(STATUS "LSBID ${LSBID}") - STRING(REPLACE "." "" LSBVERSION ${LSB_RELEASE_VERSION_SHORT}) - MESSAGE(STATUS "LSBVERSION ${LSBVERSION}") - EXECUTE_PROCESS(COMMAND dpkg-architecture -q DEB_BUILD_ARCH OUTPUT_VARIABLE ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE) - MESSAGE(STATUS "ARCHITECTURE detected ${ARCHITECTURE}") - SET(CPACK_DEBIAN_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${SERVER_VERSION}-${CMAPI_PACKAGE_VERSION}${PATCHLEVEL}~${LSBID}${LSBVERSION}_${ARCHITECTURE}") - MESSAGE(STATUS "CPACK_DEBIAN_PACKAGE_FILE_NAME ${CPACK_DEBIAN_PACKAGE_FILE_NAME}") - SET(CPACK_PACKAGE_FILE_NAME ${CPACK_DEBIAN_PACKAGE_FILE_NAME}) - # making possible to store several cmapi packages in one repo (same version as in - # Columnstore engine package) - SET(CPACK_DEBIAN_PACKAGE_VERSION "${SERVER_VERSION}-${CMAPI_PACKAGE_VERSION}${PATCHLEVEL}~${LSBID}${LSBVERSION}") - ENDIF() + string(REGEX MATCH "^..." LSBID ${LSB_RELEASE_ID_SHORT}) + message(STATUS "LSBID ${LSBID}") + string(REPLACE "." "" LSBVERSION ${LSB_RELEASE_VERSION_SHORT}) + message(STATUS "LSBVERSION ${LSBVERSION}") + execute_process( + COMMAND dpkg-architecture -q DEB_BUILD_ARCH + OUTPUT_VARIABLE ARCHITECTURE + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + message(STATUS "ARCHITECTURE detected ${ARCHITECTURE}") + set(CPACK_DEBIAN_PACKAGE_FILE_NAME + "${CPACK_PACKAGE_NAME}_${SERVER_VERSION}-${CMAPI_PACKAGE_VERSION}${PATCHLEVEL}~${LSBID}${LSBVERSION}_${ARCHITECTURE}" + ) + message(STATUS "CPACK_DEBIAN_PACKAGE_FILE_NAME ${CPACK_DEBIAN_PACKAGE_FILE_NAME}") + set(CPACK_PACKAGE_FILE_NAME ${CPACK_DEBIAN_PACKAGE_FILE_NAME}) + # making possible to store several cmapi packages in one repo (same version as in Columnstore engine package) + set(CPACK_DEBIAN_PACKAGE_VERSION "${SERVER_VERSION}-${CMAPI_PACKAGE_VERSION}${PATCHLEVEL}~${LSBID}${LSBVERSION}") +endif() -INCLUDE (CPack) +include(CPack) diff --git a/datatypes/CMakeLists.txt b/datatypes/CMakeLists.txt index 91b43920c..f2b4bbe97 100644 --- a/datatypes/CMakeLists.txt +++ b/datatypes/CMakeLists.txt @@ -1,9 +1,11 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) -set(datatypes_LIB_SRCS - mcs_int128.cpp - mcs_decimal.cpp) +include_directories(${ENGINE_COMMON_INCLUDES}) +set(datatypes_LIB_SRCS mcs_int128.cpp mcs_decimal.cpp) columnstore_library(datatypes ${datatypes_LIB_SRCS}) add_dependencies(datatypes loggingcpp external_boost) -install(TARGETS datatypes DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS datatypes + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/dbcon/CMakeLists.txt b/dbcon/CMakeLists.txt index ed587717a..8640f0e7a 100644 --- a/dbcon/CMakeLists.txt +++ b/dbcon/CMakeLists.txt @@ -1,4 +1,3 @@ - add_subdirectory(ddlpackage) add_subdirectory(ddlpackageproc) add_subdirectory(dmlpackage) @@ -6,4 +5,3 @@ add_subdirectory(dmlpackageproc) add_subdirectory(execplan) add_subdirectory(joblist) add_subdirectory(mysql) - diff --git a/dbcon/ddlpackage/CMakeLists.txt b/dbcon/ddlpackage/CMakeLists.txt index 3d1b5dfe5..975655070 100644 --- a/dbcon/ddlpackage/CMakeLists.txt +++ b/dbcon/ddlpackage/CMakeLists.txt @@ -1,20 +1,25 @@ -INCLUDE_DIRECTORIES( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) -FIND_PACKAGE(BISON REQUIRED) -BISON_TARGET(ddl_gram ddl.y ${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.cpp - DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.h - COMPILE_FLAGS "-l -p ddl --defines=${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.h") +find_package(BISON REQUIRED) +bison_target( + ddl_gram ddl.y ${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.cpp + DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.h + COMPILE_FLAGS "-l -p ddl --defines=${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.h" +) -FIND_PACKAGE(FLEX REQUIRED) -FLEX_TARGET(ddl_scan ddl.l ${CMAKE_CURRENT_BINARY_DIR}/ddl-scan.cpp COMPILE_FLAGS "-i -L -Pddl") -ADD_FLEX_BISON_DEPENDENCY(ddl_scan ddl_gram) +find_package(FLEX REQUIRED) +flex_target(ddl_scan ddl.l ${CMAKE_CURRENT_BINARY_DIR}/ddl-scan.cpp COMPILE_FLAGS "-i -L -Pddl") +add_flex_bison_dependency(ddl_scan ddl_gram) -set_source_files_properties(ddl-scan.cpp PROPERTIES COMPILE_FLAGS "-Wno-register -Wno-deprecated-register -Wno-sign-compare -DYY_NO_INPUT") +set_source_files_properties( + ddl-scan.cpp PROPERTIES COMPILE_FLAGS "-Wno-register -Wno-deprecated-register -Wno-sign-compare -DYY_NO_INPUT" +) set_source_files_properties(ddl-gram.cpp PROPERTIES COMPILE_FLAGS "-Wno-unused-but-set-variable") -########### next target ############### +# ########## next target ############### include_directories(${CMAKE_CURRENT_BINARY_DIR}) # to pick up flex/bison output -columnstore_library(ddlpackage +columnstore_library( + ddlpackage serialize.cpp ddl-scan.cpp ddl-gram.cpp @@ -39,4 +44,8 @@ columnstore_library(ddlpackage add_dependencies(ddlpackage loggingcpp) -INSTALL(TARGETS ddlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS ddlpackage + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/dbcon/ddlpackageproc/CMakeLists.txt b/dbcon/ddlpackageproc/CMakeLists.txt index 788c5bce6..159b695c3 100644 --- a/dbcon/ddlpackageproc/CMakeLists.txt +++ b/dbcon/ddlpackageproc/CMakeLists.txt @@ -1,6 +1,6 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) -########### next target ############### +# ########## next target ############### set(ddlpackageproc_LIB_SRCS ddlpackageprocessor.cpp @@ -9,7 +9,8 @@ set(ddlpackageproc_LIB_SRCS droptableprocessor.cpp markpartitionprocessor.cpp restorepartitionprocessor.cpp - droppartitionprocessor.cpp) + droppartitionprocessor.cpp +) columnstore_library(ddlpackageproc ${ddlpackageproc_LIB_SRCS}) @@ -17,4 +18,8 @@ add_dependencies(ddlpackageproc loggingcpp) target_link_libraries(ddlpackageproc ${NETSNMP_LIBRARIES}) -install(TARGETS ddlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS ddlpackageproc + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/dbcon/dmlpackage/CMakeLists.txt b/dbcon/dmlpackage/CMakeLists.txt index 3561d4f4e..00bdbc4ba 100644 --- a/dbcon/dmlpackage/CMakeLists.txt +++ b/dbcon/dmlpackage/CMakeLists.txt @@ -1,20 +1,25 @@ -INCLUDE_DIRECTORIES( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) -FIND_PACKAGE(BISON REQUIRED) -BISON_TARGET(dml_gram dml.y ${CMAKE_CURRENT_BINARY_DIR}/dml-gram.cpp - DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/dml-gram.h - COMPILE_FLAGS "-l -p dml --defines=${CMAKE_CURRENT_BINARY_DIR}/dml-gram.h") +find_package(BISON REQUIRED) +bison_target( + dml_gram dml.y ${CMAKE_CURRENT_BINARY_DIR}/dml-gram.cpp + DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/dml-gram.h + COMPILE_FLAGS "-l -p dml --defines=${CMAKE_CURRENT_BINARY_DIR}/dml-gram.h" +) -FIND_PACKAGE(FLEX REQUIRED) -FLEX_TARGET(dml_scan dml.l ${CMAKE_CURRENT_BINARY_DIR}/dml-scan.cpp COMPILE_FLAGS "-i -L -Pdml") -ADD_FLEX_BISON_DEPENDENCY(dml_scan dml_gram) +find_package(FLEX REQUIRED) +flex_target(dml_scan dml.l ${CMAKE_CURRENT_BINARY_DIR}/dml-scan.cpp COMPILE_FLAGS "-i -L -Pdml") +add_flex_bison_dependency(dml_scan dml_gram) -set_source_files_properties(dml-scan.cpp PROPERTIES COMPILE_FLAGS "-Wno-register -Wno-deprecated-register -Wno-sign-compare -DYY_NO_INPUT") +set_source_files_properties( + dml-scan.cpp PROPERTIES COMPILE_FLAGS "-Wno-register -Wno-deprecated-register -Wno-sign-compare -DYY_NO_INPUT" +) set_source_files_properties(dml-gram.cpp PROPERTIES COMPILE_FLAGS "-Wno-unused-but-set-variable") -########### next target ############### +# ########## next target ############### -include_directories(${CMAKE_CURRENT_BINARY_DIR}) # to pick up flex/bison output -columnstore_library(dmlpackage +include_directories(${CMAKE_CURRENT_BINARY_DIR}) # to pick up flex/bison output +columnstore_library( + dmlpackage dml-scan.cpp dml-gram.cpp calpontdmlfactory.cpp @@ -38,4 +43,8 @@ columnstore_library(dmlpackage add_dependencies(dmlpackage loggingcpp) -INSTALL(TARGETS dmlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS dmlpackage + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/dbcon/dmlpackageproc/CMakeLists.txt b/dbcon/dmlpackageproc/CMakeLists.txt index e44609f7a..78559befd 100644 --- a/dbcon/dmlpackageproc/CMakeLists.txt +++ b/dbcon/dmlpackageproc/CMakeLists.txt @@ -1,7 +1,6 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) - -########### next target ############### +# ########## next target ############### set(dmlpackageproc_LIB_SRCS deletepackageprocessor.cpp @@ -10,7 +9,8 @@ set(dmlpackageproc_LIB_SRCS updatepackageprocessor.cpp commandpackageprocessor.cpp autoincrementdata.cpp - tablelockdata.cpp) + tablelockdata.cpp +) columnstore_library(dmlpackageproc ${dmlpackageproc_LIB_SRCS}) @@ -18,4 +18,8 @@ add_dependencies(dmlpackageproc loggingcpp) target_link_libraries(dmlpackageproc ${NETSNMP_LIBRARIES}) -install(TARGETS dmlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS dmlpackageproc + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/dbcon/execplan/CMakeLists.txt b/dbcon/execplan/CMakeLists.txt index 4a30e8505..8faee6a32 100755 --- a/dbcon/execplan/CMakeLists.txt +++ b/dbcon/execplan/CMakeLists.txt @@ -1,7 +1,6 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ${ENGINE_UTILS_UDFSDK_INCLUDE} ${ENGINE_DATATYPES_INCLUDE}) +include_directories(${ENGINE_COMMON_INCLUDES} ${ENGINE_UTILS_UDFSDK_INCLUDE} ${ENGINE_DATATYPES_INCLUDE}) - -########### next target ############### +# ########## next target ############### set(execplan_LIB_SRCS calpontsystemcatalog.cpp @@ -43,7 +42,8 @@ set(execplan_LIB_SRCS treenodeimpl.cpp vendorexecutionplan.cpp windowfunctioncolumn.cpp - udafcolumn.cpp) + udafcolumn.cpp +) columnstore_library(execplan ${execplan_LIB_SRCS}) @@ -51,4 +51,8 @@ add_dependencies(execplan loggingcpp) target_link_libraries(execplan messageqcpp ${NETSNMP_LIBRARIES} ${MARIADB_STRING_LIBS} ${ENGINE_DT_LIB} pron) -install(TARGETS execplan DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS execplan + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/ddlproc/CMakeLists.txt b/ddlproc/CMakeLists.txt index 822fb0e7a..0c8c3d8cb 100644 --- a/ddlproc/CMakeLists.txt +++ b/ddlproc/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(DDLProc_SRCS ddlproc.cpp ddlprocessor.cpp ../utils/common/crashtrace.cpp) @@ -12,5 +10,8 @@ add_dependencies(DDLProc loggingcpp) target_link_libraries(DDLProc ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool) -install(TARGETS DDLProc DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) - +install( + TARGETS DDLProc + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/dmlproc/CMakeLists.txt b/dmlproc/CMakeLists.txt index f975c9cf8..e551e4e54 100644 --- a/dmlproc/CMakeLists.txt +++ b/dmlproc/CMakeLists.txt @@ -1,23 +1,27 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) +# ########## next target ############### - -########### next target ############### - -set(DMLProc_SRCS - dmlproc.cpp - dmlprocessor.cpp - dmlresultbuffer.cpp - batchinsertprocessor.cpp - ../utils/common/crashtrace.cpp) +set(DMLProc_SRCS dmlproc.cpp dmlprocessor.cpp dmlresultbuffer.cpp batchinsertprocessor.cpp + ../utils/common/crashtrace.cpp +) add_executable(DMLProc ${DMLProc_SRCS}) add_dependencies(DMLProc loggingcpp) -target_link_libraries(DMLProc ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool ddlcleanuputil batchloader) - -install(TARGETS DMLProc DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) - - +target_link_libraries( + DMLProc + ${ENGINE_LDFLAGS} + ${ENGINE_WRITE_LIBS} + ${NETSNMP_LIBRARIES} + threadpool + ddlcleanuputil + batchloader +) +install( + TARGETS DMLProc + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/oam/CMakeLists.txt b/oam/CMakeLists.txt index 952c7f3c1..bdfd07478 100644 --- a/oam/CMakeLists.txt +++ b/oam/CMakeLists.txt @@ -1,4 +1,2 @@ - add_subdirectory(etc) add_subdirectory(install_scripts) - diff --git a/oam/cloud/CMakeLists.txt b/oam/cloud/CMakeLists.txt index e69de29bb..8b1378917 100644 --- a/oam/cloud/CMakeLists.txt +++ b/oam/cloud/CMakeLists.txt @@ -0,0 +1 @@ + diff --git a/oam/etc/CMakeLists.txt b/oam/etc/CMakeLists.txt index 3d4ae3dfe..5fbaaf449 100644 --- a/oam/etc/CMakeLists.txt +++ b/oam/etc/CMakeLists.txt @@ -1,3 +1,5 @@ - -install(FILES Columnstore.xml - DESTINATION ${ENGINE_SYSCONFDIR}/columnstore COMPONENT columnstore-engine) +install( + FILES Columnstore.xml + DESTINATION ${ENGINE_SYSCONFDIR}/columnstore + COMPONENT columnstore-engine +) diff --git a/oam/oamcpp/CMakeLists.txt b/oam/oamcpp/CMakeLists.txt index 51eee0694..59014f291 100644 --- a/oam/oamcpp/CMakeLists.txt +++ b/oam/oamcpp/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(oamcpp_LIB_SRCS liboamcpp.cpp oamcache.cpp) @@ -10,9 +8,12 @@ columnstore_library(oamcpp ${oamcpp_LIB_SRCS}) add_dependencies(oamcpp loggingcpp) -target_link_libraries(oamcpp ) +target_link_libraries(oamcpp) target_compile_options(oamcpp PRIVATE -Wno-unused-result) -install(TARGETS oamcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) - +install( + TARGETS oamcpp + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/oam/replaytxnlog/CMakeLists.txt b/oam/replaytxnlog/CMakeLists.txt index bf4c1a33d..42647ba56 100644 --- a/oam/replaytxnlog/CMakeLists.txt +++ b/oam/replaytxnlog/CMakeLists.txt @@ -1,49 +1,34 @@ - # # Not used # -# +# original Makefile.am contents follow: -#original Makefile.am contents follow: - -## Copyright (C) 2014 InfiniDB, Inc. -## -## This program is free software; you can redistribute it and/or -## modify it under the terms of the GNU General Public License -## as published by the Free Software Foundation; version 2 of -## the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -## MA 02110-1301, USA. +# Copyright (C) 2014 InfiniDB, Inc. # -## $Id: Makefile.am 864 2009-04-02 19:22:49Z rdempsey $ -### Process this file with automake to produce Makefile.in +# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; version 2 of the License. # -#AM_CPPFLAGS = $(idb_cppflags) -#AM_CFLAGS = $(idb_cflags) -#AM_CXXFLAGS = $(idb_cxxflags) -#AM_LDFLAGS = $(idb_ldflags) -#lib_LTLIBRARIES = libreplaytxnlog.la -#libreplaytxnlog_la_SOURCES = replaytxnlog.cpp -#libreplaytxnlog_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) -#libreplaytxnlog_la_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS) -#include_HEADERS = replaytxnlog.h +# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -#test: +# You should have received a copy of the GNU General Public License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -#coverage: +# $Id: Makefile.am 864 2009-04-02 19:22:49Z rdempsey $ Process this file with automake to produce Makefile.in # -#leakcheck: +# AM_CPPFLAGS = $(idb_cppflags) AM_CFLAGS = $(idb_cflags) AM_CXXFLAGS = $(idb_cxxflags) AM_LDFLAGS = $(idb_ldflags) +# lib_LTLIBRARIES = libreplaytxnlog.la libreplaytxnlog_la_SOURCES = replaytxnlog.cpp libreplaytxnlog_la_LDFLAGS = +# -version-info 1:0:0 $(AM_LDFLAGS) libreplaytxnlog_la_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS) include_HEADERS = +# replaytxnlog.h # -#docs: +# test: # -#bootstrap: install-data-am +# coverage: +# +# leakcheck: +# +# docs: +# +# bootstrap: install-data-am # diff --git a/oamapps/CMakeLists.txt b/oamapps/CMakeLists.txt index e17effd06..0052c0593 100644 --- a/oamapps/CMakeLists.txt +++ b/oamapps/CMakeLists.txt @@ -1,3 +1,2 @@ - add_subdirectory(columnstoreDB) add_subdirectory(postConfigure) diff --git a/oamapps/columnstoreDB/CMakeLists.txt b/oamapps/columnstoreDB/CMakeLists.txt index f06670f8e..17c66c8f9 100644 --- a/oamapps/columnstoreDB/CMakeLists.txt +++ b/oamapps/columnstoreDB/CMakeLists.txt @@ -1,14 +1,15 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(columnstoreDBWrite_SRCS columnstoreDB.cpp) add_executable(columnstoreDBWrite ${columnstoreDBWrite_SRCS}) -target_link_libraries(columnstoreDBWrite ${ENGINE_LDFLAGS} ncurses ${ENGINE_EXEC_LIBS}) - -install(TARGETS columnstoreDBWrite DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) +target_link_libraries(columnstoreDBWrite ${ENGINE_LDFLAGS} ncurses ${ENGINE_EXEC_LIBS}) +install( + TARGETS columnstoreDBWrite + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/oamapps/columnstoreSupport/CMakeLists.txt b/oamapps/columnstoreSupport/CMakeLists.txt index 2aeb77eeb..38afc74c1 100644 --- a/oamapps/columnstoreSupport/CMakeLists.txt +++ b/oamapps/columnstoreSupport/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(columnstoreSupport_SRCS columnstoreSupport.cpp mcsSupportUtil.cpp) @@ -10,11 +8,16 @@ add_executable(columnstoreSupport ${columnstoreSupport_SRCS}) target_compile_options(columnstoreSupport PRIVATE -Wno-unused-result) -target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} ncurses ${ENGINE_EXEC_LIBS}) +target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} ncurses ${ENGINE_EXEC_LIBS}) -install(TARGETS columnstoreSupport DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) +install( + TARGETS columnstoreSupport + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) -install(PROGRAMS dbmsReport.sh bulklogReport.sh configReport.sh - hardwareReport.sh logReport.sh resourceReport.sh - DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) - +install( + PROGRAMS dbmsReport.sh bulklogReport.sh configReport.sh hardwareReport.sh logReport.sh resourceReport.sh + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/oamapps/postConfigure/CMakeLists.txt b/oamapps/postConfigure/CMakeLists.txt index 470e8ea6d..50a25abea 100644 --- a/oamapps/postConfigure/CMakeLists.txt +++ b/oamapps/postConfigure/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(mycnfUpgrade_SRCS mycnfUpgrade.cpp) @@ -12,5 +10,8 @@ target_compile_options(mycnfUpgrade PRIVATE -Wno-unused-result) target_link_libraries(mycnfUpgrade ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${ENGINE_EXEC_LIBS}) -install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) - +install( + TARGETS mycnfUpgrade + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/oamapps/replayTransactionLog/CMakeLists.txt b/oamapps/replayTransactionLog/CMakeLists.txt index 3a86d6569..678ebba7a 100644 --- a/oamapps/replayTransactionLog/CMakeLists.txt +++ b/oamapps/replayTransactionLog/CMakeLists.txt @@ -1,49 +1,34 @@ - # # Not used # -# +# original Makefile.am contents follow: - -#original Makefile.am contents follow: - -## Copyright (C) 2014 InfiniDB, Inc. -## -## This program is free software; you can redistribute it and/or -## modify it under the terms of the GNU General Public License -## as published by the Free Software Foundation; version 2 of -## the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -## MA 02110-1301, USA. +# Copyright (C) 2014 InfiniDB, Inc. # -## $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $ -### Process this file with automake to produce Makefile.in +# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; version 2 of the License. # -#AM_CPPFLAGS = $(idb_cppflags) -#AM_CFLAGS = $(idb_cflags) -#AM_CXXFLAGS = $(idb_cxxflags) -#AM_LDFLAGS = $(idb_ldflags) -#bin_PROGRAMS = ReplayTransactionLog -#ReplayTransactionLog_SOURCES = replaytransactionlog.cpp -#ReplayTransactionLog_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS) -#ReplayTransactionLog_LDFLAGS = @idb_common_ldflags@ @idb_exec_libs@ -lreplaytxnlog $(AM_LDFLAGS) +# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -#test: +# You should have received a copy of the GNU General Public License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -#coverage: +# $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $ Process this file with automake to produce Makefile.in # -#leakcheck: +# AM_CPPFLAGS = $(idb_cppflags) AM_CFLAGS = $(idb_cflags) AM_CXXFLAGS = $(idb_cxxflags) AM_LDFLAGS = $(idb_ldflags) +# bin_PROGRAMS = ReplayTransactionLog ReplayTransactionLog_SOURCES = replaytransactionlog.cpp +# ReplayTransactionLog_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS) ReplayTransactionLog_LDFLAGS = +# @idb_common_ldflags@ @idb_exec_libs@ -lreplaytxnlog $(AM_LDFLAGS) # -#docs: +# test: # -#bootstrap: install-data-am +# coverage: +# +# leakcheck: +# +# docs: +# +# bootstrap: install-data-am # diff --git a/oamapps/sessionWalker/CMakeLists.txt b/oamapps/sessionWalker/CMakeLists.txt index b6224e23e..fe6fe4fea 100644 --- a/oamapps/sessionWalker/CMakeLists.txt +++ b/oamapps/sessionWalker/CMakeLists.txt @@ -1,49 +1,34 @@ - # # Not used # -# +# original Makefile.am contents follow: - -#original Makefile.am contents follow: - -## Copyright (C) 2014 InfiniDB, Inc. -## -## This program is free software; you can redistribute it and/or -## modify it under the terms of the GNU General Public License -## as published by the Free Software Foundation; version 2 of -## the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -## MA 02110-1301, USA. +# Copyright (C) 2014 InfiniDB, Inc. # -## $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $ -### Process this file with automake to produce Makefile.in +# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; version 2 of the License. # -#AM_CPPFLAGS = $(idb_cppflags) -#AM_CFLAGS = $(idb_cflags) -#AM_CXXFLAGS = $(idb_cxxflags) -#AM_LDFLAGS = $(idb_ldflags) -#bin_PROGRAMS = sessionWalker -#sessionWalker_SOURCES = sessionwalker.cpp -#sessionWalker_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS) -#sessionWalker_LDFLAGS = @idb_common_ldflags@ @idb_common_libs@ @idb_write_libs@ @netsnmp_libs@ $(AM_LDFLAGS) +# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -#test: +# You should have received a copy of the GNU General Public License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -#coverage: +# $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $ Process this file with automake to produce Makefile.in # -#leakcheck: +# AM_CPPFLAGS = $(idb_cppflags) AM_CFLAGS = $(idb_cflags) AM_CXXFLAGS = $(idb_cxxflags) AM_LDFLAGS = $(idb_ldflags) +# bin_PROGRAMS = sessionWalker sessionWalker_SOURCES = sessionwalker.cpp sessionWalker_CPPFLAGS = @idb_common_includes@ +# $(AM_CPPFLAGS) sessionWalker_LDFLAGS = @idb_common_ldflags@ @idb_common_libs@ @idb_write_libs@ @netsnmp_libs@ +# $(AM_LDFLAGS) # -#docs: +# test: # -#bootstrap: install-data-am +# coverage: +# +# leakcheck: +# +# docs: +# +# bootstrap: install-data-am # diff --git a/primitives/CMakeLists.txt b/primitives/CMakeLists.txt index 71f2739d6..fec6b3273 100644 --- a/primitives/CMakeLists.txt +++ b/primitives/CMakeLists.txt @@ -1,5 +1,3 @@ - add_subdirectory(blockcache) add_subdirectory(linux-port) add_subdirectory(primproc) - diff --git a/primitives/blockcache/CMakeLists.txt b/primitives/blockcache/CMakeLists.txt index c6a16056e..b000247b9 100644 --- a/primitives/blockcache/CMakeLists.txt +++ b/primitives/blockcache/CMakeLists.txt @@ -1,7 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES} ../primproc) -include_directories( ${ENGINE_COMMON_INCLUDES} ../primproc) - -########### next target ############### +# ########## next target ############### set(dbbc_STAT_SRCS blockcacheclient.cpp @@ -12,9 +11,10 @@ set(dbbc_STAT_SRCS filerequest.cpp iomanager.cpp stats.cpp - fsutils.cpp) + fsutils.cpp +) -#libdbbc_a_CXXFLAGS = $(march_flags) $(AM_CXXFLAGS) +# libdbbc_a_CXXFLAGS = $(march_flags) $(AM_CXXFLAGS) add_library(dbbc STATIC ${dbbc_STAT_SRCS}) @@ -22,4 +22,4 @@ add_dependencies(dbbc loggingcpp) target_link_libraries(dbbc ${NETSNMP_LIBRARIES}) -INSTALL (TARGETS dbbc DESTINATION ${ENGINE_LIBDIR}) +install(TARGETS dbbc DESTINATION ${ENGINE_LIBDIR}) diff --git a/primitives/linux-port/CMakeLists.txt b/primitives/linux-port/CMakeLists.txt index fdc7fae8c..9c566dc94 100644 --- a/primitives/linux-port/CMakeLists.txt +++ b/primitives/linux-port/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES} ../blockcache ../primproc) -include_directories( ${ENGINE_COMMON_INCLUDES} ../blockcache ../primproc) - - -########### next target ############### +# ########## next target ############### set(processor_STAT_SRCS primitiveprocessor.cpp dictionary.cpp column.cpp) @@ -12,4 +10,4 @@ add_dependencies(processor loggingcpp) target_link_libraries(processor ${NETSNMP_LIBRARIES}) -INSTALL (TARGETS processor DESTINATION ${ENGINE_LIBDIR}) +install(TARGETS processor DESTINATION ${ENGINE_LIBDIR}) diff --git a/primitives/primproc/CMakeLists.txt b/primitives/primproc/CMakeLists.txt index cf7c6575d..740a43e74 100644 --- a/primitives/primproc/CMakeLists.txt +++ b/primitives/primproc/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES} ../blockcache ../linux-port) -include_directories( ${ENGINE_COMMON_INCLUDES} ../blockcache ../linux-port) - - -########### next target ############### +# ########## next target ############### set(PrimProc_SRCS primproc.cpp @@ -24,12 +22,26 @@ set(PrimProc_SRCS rssmonfcn.cpp activestatementcounter.cpp femsghandler.cpp - ../../utils/common/crashtrace.cpp) + ../../utils/common/crashtrace.cpp +) add_executable(PrimProc ${PrimProc_SRCS}) add_dependencies(PrimProc loggingcpp) target_include_directories(PrimProc PRIVATE ${Boost_INCLUDE_DIRS}) -target_link_libraries(PrimProc ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS} threadpool cacheutils dbbc processor) +target_link_libraries( + PrimProc + ${ENGINE_LDFLAGS} + ${NETSNMP_LIBRARIES} + ${ENGINE_WRITE_LIBS} + threadpool + cacheutils + dbbc + processor +) -install(TARGETS PrimProc DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) +install( + TARGETS PrimProc + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index c7f96e121..600b3607e 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,4 +1,3 @@ - add_subdirectory(dbbuilder) add_subdirectory(editem) add_subdirectory(dbloadxml) diff --git a/tools/cfread/CMakeLists.txt b/tools/cfread/CMakeLists.txt index 49a9a76b9..ba724302e 100644 --- a/tools/cfread/CMakeLists.txt +++ b/tools/cfread/CMakeLists.txt @@ -1,58 +1,77 @@ +include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}) -include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(cfread_SRCS cfread.cpp) kde4_add_executable(cfread ${cfread_SRCS}) -target_link_libraries(cfread ${KDE4_KDECORE_LIBS} pthread writeengine brm rwlock messageqcpp dl configcpp xml2 loggingcpp cacheutils boost_idb pthread rt) +target_link_libraries( + cfread + ${KDE4_KDECORE_LIBS} + pthread + writeengine + brm + rwlock + messageqcpp + dl + configcpp + xml2 + loggingcpp + cacheutils + boost_idb + pthread + rt +) install(TARGETS cfread ${INSTALL_TARGETS_DEFAULT_ARGS}) - -########### next target ############### +# ########## next target ############### set(mtread_SRCS mtread.cpp) kde4_add_executable(mtread ${mtread_SRCS}) -target_link_libraries(mtread ${KDE4_KDECORE_LIBS} pthread writeengine brm rwlock messageqcpp dl configcpp xml2 loggingcpp cacheutils boost_idb pthread rt) +target_link_libraries( + mtread + ${KDE4_KDECORE_LIBS} + pthread + writeengine + brm + rwlock + messageqcpp + dl + configcpp + xml2 + loggingcpp + cacheutils + boost_idb + pthread + rt +) install(TARGETS mtread ${INSTALL_TARGETS_DEFAULT_ARGS}) +# ########## install files ############### -########### install files ############### +# original Makefile.am contents follow: - - - -#original Makefile.am contents follow: - -## $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $ -### Process this file with automake to produce Makefile.in +# $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $ Process this file with automake to produce Makefile.in # -#AM_CPPFLAGS = $(idb_cppflags) -#AM_CFLAGS = $(idb_cflags) -#AM_CXXFLAGS = $(idb_cxxflags) -#AM_LDFLAGS = $(idb_ldflags) -#bin_PROGRAMS = cfread mtread -#cfread_SOURCES = cfread.cpp -#cfread_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS) -#cfread_LDFLAGS = @idb_common_ldflags@ -lpthread -lwriteengine -lbrm -lrwlock -lmessageqcpp -ldl -lconfigcpp -lxml2 -lloggingcpp -lcacheutils -lboost_idb -lpthread -lrt $(AM_LDFLAGS) -#mtread_SOURCES = mtread.cpp -#mtread_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS) -#mtread_LDFLAGS = @idb_common_ldflags@ -lpthread -lwriteengine -lbrm -lrwlock -lmessageqcpp -ldl -lconfigcpp -lxml2 -lloggingcpp -lcacheutils -lboost_idb -lpthread -lrt $(AM_LDFLAGS) +# AM_CPPFLAGS = $(idb_cppflags) AM_CFLAGS = $(idb_cflags) AM_CXXFLAGS = $(idb_cxxflags) AM_LDFLAGS = $(idb_ldflags) +# bin_PROGRAMS = cfread mtread cfread_SOURCES = cfread.cpp cfread_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS) +# cfread_LDFLAGS = @idb_common_ldflags@ -lpthread -lwriteengine -lbrm -lrwlock -lmessageqcpp -ldl -lconfigcpp -lxml2 +# -lloggingcpp -lcacheutils -lboost_idb -lpthread -lrt $(AM_LDFLAGS) mtread_SOURCES = mtread.cpp mtread_CPPFLAGS = +# @idb_common_includes@ $(AM_CPPFLAGS) mtread_LDFLAGS = @idb_common_ldflags@ -lpthread -lwriteengine -lbrm -lrwlock +# -lmessageqcpp -ldl -lconfigcpp -lxml2 -lloggingcpp -lcacheutils -lboost_idb -lpthread -lrt $(AM_LDFLAGS) # -#test: +# test: # -#coverage: +# coverage: # -#leakcheck: +# leakcheck: # -#docs: +# docs: # -#bootstrap: install-data-am +# bootstrap: install-data-am # diff --git a/tools/clearShm/CMakeLists.txt b/tools/clearShm/CMakeLists.txt index cba87d177..b36acb03c 100644 --- a/tools/clearShm/CMakeLists.txt +++ b/tools/clearShm/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(clearShm_SRCS main.cpp) @@ -10,5 +8,8 @@ add_executable(clearShm ${clearShm_SRCS}) target_link_libraries(clearShm ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS}) -install(TARGETS clearShm DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) - +install( + TARGETS clearShm + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/tools/cleartablelock/CMakeLists.txt b/tools/cleartablelock/CMakeLists.txt index 7b6b1730f..02f93d42a 100644 --- a/tools/cleartablelock/CMakeLists.txt +++ b/tools/cleartablelock/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(cleartablelock_SRCS cleartablelock.cpp cleartablelockthread.cpp) @@ -10,5 +8,8 @@ add_executable(cleartablelock ${cleartablelock_SRCS}) target_link_libraries(cleartablelock ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS}) -install(TARGETS cleartablelock DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) - +install( + TARGETS cleartablelock + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/tools/configMgt/CMakeLists.txt b/tools/configMgt/CMakeLists.txt index ec730a3f3..9bf076855 100644 --- a/tools/configMgt/CMakeLists.txt +++ b/tools/configMgt/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(autoConfigure_SRCS autoConfigure.cpp) @@ -10,4 +8,4 @@ add_executable(autoConfigure ${autoConfigure_SRCS}) target_link_libraries(autoConfigure ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_EXEC_LIBS}) -#install(TARGETS autoConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) +# install(TARGETS autoConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) diff --git a/tools/cplogger/CMakeLists.txt b/tools/cplogger/CMakeLists.txt index 9f1b5f612..2d6c50233 100644 --- a/tools/cplogger/CMakeLists.txt +++ b/tools/cplogger/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(cplogger_SRCS main.cpp) @@ -10,5 +8,8 @@ add_executable(cplogger ${cplogger_SRCS}) target_link_libraries(cplogger ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS}) -install(TARGETS cplogger DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) - +install( + TARGETS cplogger + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/tools/dbbuilder/CMakeLists.txt b/tools/dbbuilder/CMakeLists.txt index 922f4b766..284240d98 100644 --- a/tools/dbbuilder/CMakeLists.txt +++ b/tools/dbbuilder/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(dbbuilder_SRCS dbbuilder.cpp systemcatalog.cpp) @@ -10,5 +8,8 @@ add_executable(dbbuilder ${dbbuilder_SRCS}) target_link_libraries(dbbuilder ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS}) -install(TARGETS dbbuilder DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) - +install( + TARGETS dbbuilder + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/tools/dbloadxml/CMakeLists.txt b/tools/dbloadxml/CMakeLists.txt index cfd4875bd..f94641a53 100644 --- a/tools/dbloadxml/CMakeLists.txt +++ b/tools/dbloadxml/CMakeLists.txt @@ -1,7 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - -########### next target ############### +# ########## next target ############### set(dbload_STAT_SRCS inputmgr.cpp) @@ -9,7 +8,7 @@ add_library(dbload STATIC ${dbload_STAT_SRCS}) add_dependencies(dbload loggingcpp) -########### next target ############### +# ########## next target ############### set(colxml_SRCS colxml.cpp) @@ -17,5 +16,8 @@ add_executable(colxml ${colxml_SRCS}) target_link_libraries(colxml ${ENGINE_LDFLAGS} dbload ${ENGINE_WRITE_LIBS}) -install(TARGETS colxml DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) - +install( + TARGETS colxml + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/tools/ddlcleanup/CMakeLists.txt b/tools/ddlcleanup/CMakeLists.txt index 2247fc1c4..6e67a6de1 100644 --- a/tools/ddlcleanup/CMakeLists.txt +++ b/tools/ddlcleanup/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(ddlcleanup_SRCS ddlcleanup.cpp) @@ -10,5 +8,8 @@ add_executable(ddlcleanup ${ddlcleanup_SRCS}) target_link_libraries(ddlcleanup ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS} ddlcleanuputil) -install(TARGETS ddlcleanup DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) - +install( + TARGETS ddlcleanup + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/tools/ddldriver/CMakeLists.txt b/tools/ddldriver/CMakeLists.txt index 366f99bb1..b75b7ef45 100644 --- a/tools/ddldriver/CMakeLists.txt +++ b/tools/ddldriver/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}) -include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(ddldriver_SRCS ddldriver.cpp) @@ -12,50 +10,34 @@ target_link_libraries(ddldriver ${KDE4_KDECORE_LIBS}) install(TARGETS ddldriver ${INSTALL_TARGETS_DEFAULT_ARGS}) +# ########## install files ############### -########### install files ############### +# original Makefile.am contents follow: - - - -#original Makefile.am contents follow: - -## Copyright (C) 2014 InfiniDB, Inc. -## -## This program is free software; you can redistribute it and/or -## modify it under the terms of the GNU General Public License -## as published by the Free Software Foundation; version 2 of -## the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -## MA 02110-1301, USA. +# Copyright (C) 2014 InfiniDB, Inc. # -## $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $ -### Process this file with automake to produce Makefile.in +# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; version 2 of the License. # -#AM_CPPFLAGS = $(idb_cppflags) -#AM_CFLAGS = $(idb_cflags) -#AM_CXXFLAGS = $(idb_cxxflags) -#AM_LDFLAGS = $(idb_ldflags) -#bin_PROGRAMS = ddldriver -#ddldriver_SOURCES = ddldriver.cpp -#ddldriver_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS) -#ddldriver_LDFLAGS = @idb_common_ldflags@ @idb_write_libs@ @idb_common_libs@ @netsnmp_libs@ $(AM_LDFLAGS) +# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -#test: +# You should have received a copy of the GNU General Public License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -#coverage: +# $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $ Process this file with automake to produce Makefile.in # -#leakcheck: +# AM_CPPFLAGS = $(idb_cppflags) AM_CFLAGS = $(idb_cflags) AM_CXXFLAGS = $(idb_cxxflags) AM_LDFLAGS = $(idb_ldflags) +# bin_PROGRAMS = ddldriver ddldriver_SOURCES = ddldriver.cpp ddldriver_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS) +# ddldriver_LDFLAGS = @idb_common_ldflags@ @idb_write_libs@ @idb_common_libs@ @netsnmp_libs@ $(AM_LDFLAGS) # -#docs: +# test: # -#bootstrap: install-data-am +# coverage: +# +# leakcheck: +# +# docs: +# +# bootstrap: install-data-am # diff --git a/tools/dmldriver/CMakeLists.txt b/tools/dmldriver/CMakeLists.txt index 0af124d5f..a98dd62b1 100644 --- a/tools/dmldriver/CMakeLists.txt +++ b/tools/dmldriver/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}) -include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(dmldriver_SRCS dmldriver.cpp tpchrf2.cpp dmlif.cpp) @@ -12,50 +10,35 @@ target_link_libraries(dmldriver ${KDE4_KDECORE_LIBS}) install(TARGETS dmldriver ${INSTALL_TARGETS_DEFAULT_ARGS}) +# ########## install files ############### -########### install files ############### +# original Makefile.am contents follow: - - - -#original Makefile.am contents follow: - -## Copyright (C) 2014 InfiniDB, Inc. -## -## This program is free software; you can redistribute it and/or -## modify it under the terms of the GNU General Public License -## as published by the Free Software Foundation; version 2 of -## the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -## MA 02110-1301, USA. +# Copyright (C) 2014 InfiniDB, Inc. # -## $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $ -### Process this file with automake to produce Makefile.in +# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; version 2 of the License. # -#AM_CPPFLAGS = $(idb_cppflags) -#AM_CFLAGS = $(idb_cflags) -#AM_CXXFLAGS = $(idb_cxxflags) -#AM_LDFLAGS = $(idb_ldflags) -#bin_PROGRAMS = dmldriver -#dmldriver_SOURCES = dmldriver.cpp tpchrf2.cpp dmlif.cpp -#dmldriver_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS) -#dmldriver_LDFLAGS = @idb_common_ldflags@ @idb_write_libs@ @idb_common_libs@ @netsnmp_libs@ $(AM_LDFLAGS) +# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -#test: +# You should have received a copy of the GNU General Public License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -#coverage: +# $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $ Process this file with automake to produce Makefile.in # -#leakcheck: +# AM_CPPFLAGS = $(idb_cppflags) AM_CFLAGS = $(idb_cflags) AM_CXXFLAGS = $(idb_cxxflags) AM_LDFLAGS = $(idb_ldflags) +# bin_PROGRAMS = dmldriver dmldriver_SOURCES = dmldriver.cpp tpchrf2.cpp dmlif.cpp dmldriver_CPPFLAGS = +# @idb_common_includes@ $(AM_CPPFLAGS) dmldriver_LDFLAGS = @idb_common_ldflags@ @idb_write_libs@ @idb_common_libs@ +# @netsnmp_libs@ $(AM_LDFLAGS) # -#docs: +# test: # -#bootstrap: install-data-am +# coverage: +# +# leakcheck: +# +# docs: +# +# bootstrap: install-data-am # diff --git a/tools/editem/CMakeLists.txt b/tools/editem/CMakeLists.txt index ea27d99a0..8e49c91e1 100644 --- a/tools/editem/CMakeLists.txt +++ b/tools/editem/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(editem_SRCS editem.cpp) @@ -10,5 +8,8 @@ add_executable(editem ${editem_SRCS}) target_link_libraries(editem ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_EXEC_LIBS}) -install(TARGETS editem DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) - +install( + TARGETS editem + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/tools/getConfig/CMakeLists.txt b/tools/getConfig/CMakeLists.txt index 80edf254f..182c9455f 100644 --- a/tools/getConfig/CMakeLists.txt +++ b/tools/getConfig/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(getConfig_SRCS main.cpp) @@ -10,5 +8,8 @@ add_executable(mcsGetConfig ${getConfig_SRCS}) target_link_libraries(mcsGetConfig ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS}) -install(TARGETS mcsGetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) - +install( + TARGETS mcsGetConfig + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/tools/idbmeminfo/CMakeLists.txt b/tools/idbmeminfo/CMakeLists.txt index 5b0fd3511..c49eb8fa2 100644 --- a/tools/idbmeminfo/CMakeLists.txt +++ b/tools/idbmeminfo/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(idbmeminfo_SRCS idbmeminfo.cpp) @@ -10,5 +8,8 @@ add_executable(idbmeminfo ${idbmeminfo_SRCS}) target_link_libraries(idbmeminfo ${ENGINE_LDFLAGS}) -install(TARGETS idbmeminfo DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) - +install( + TARGETS idbmeminfo + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/tools/passwd/CMakeLists.txt b/tools/passwd/CMakeLists.txt index 67eb12f40..94f7eec4b 100644 --- a/tools/passwd/CMakeLists.txt +++ b/tools/passwd/CMakeLists.txt @@ -1,7 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES} ${ENGINE_UTILS_COMMON_INCLUDE}) -include_directories( ${ENGINE_COMMON_INCLUDES} ${ENGINE_UTILS_COMMON_INCLUDE} ) - -########### next target ############### +# ########## next target ############### set(cspasswd_SRCS cspasswd.cpp secrets.cpp) set(cskeys_SRCS cskeys.cpp secrets.cpp) @@ -13,6 +12,13 @@ target_include_directories(cskeys BEFORE PUBLIC ${OPENSSL_INCLUDE_DIR}) target_link_libraries(cspasswd ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${SSL_LIBRARIES}) target_link_libraries(cskeys ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${SSL_LIBRARIES}) -install(TARGETS cspasswd DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) -install(TARGETS cskeys DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) - +install( + TARGETS cspasswd + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) +install( + TARGETS cskeys + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/tools/qfe/CMakeLists.txt b/tools/qfe/CMakeLists.txt index 923796412..060ce3425 100644 --- a/tools/qfe/CMakeLists.txt +++ b/tools/qfe/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}) -include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(QFE_SRCS cseputils.cpp @@ -13,7 +11,8 @@ set(QFE_SRCS server.cpp socketio.cpp qfelexer.lpp - qfeparser.ypp) + qfeparser.ypp +) kde4_add_executable(QFE ${QFE_SRCS}) @@ -21,62 +20,36 @@ target_link_libraries(QFE ${KDE4_KDECORE_LIBS}) install(TARGETS QFE ${INSTALL_TARGETS_DEFAULT_ARGS}) +# ########## install files ############### -########### install files ############### +# original Makefile.am contents follow: - - - -#original Makefile.am contents follow: - -## Copyright (C) 2014 InfiniDB, Inc. -## -## This program is free software; you can redistribute it and/or -## modify it under the terms of the GNU General Public License -## as published by the Free Software Foundation; version 2 of -## the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -## MA 02110-1301, USA. +# Copyright (C) 2014 InfiniDB, Inc. # -## $Id$ -### Process this file with automake to produce Makefile.in +# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; version 2 of the License. # -#AM_CPPFLAGS = $(idb_cppflags) -#AM_CFLAGS = $(idb_cflags) -#AM_CXXFLAGS = $(idb_cxxflags) -#AM_LDFLAGS = $(idb_ldflags) -#AM_YFLAGS = -d -p qfe -#AM_LFLAGS = -i -Pqfe -olex.yy.c -#bin_PROGRAMS = QFE -#QFE_SOURCES = \ -#cseputils.cpp \ -#ddlstmts.cpp \ -#parsequery.cpp \ -#returnedrows.cpp \ -#sendcsep.cpp \ -#server.cpp \ -#socketio.cpp \ -#qfelexer.lpp \ -#qfeparser.ypp -#QFE_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS) -#QFE_LDFLAGS = @idb_common_ldflags@ @idb_write_libs@ @idb_exec_libs@ $(AM_LDFLAGS) -#BUILT_SOURCES = qfeparser.cpp qfelexer.cpp qfeparser.h +# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -#test: +# You should have received a copy of the GNU General Public License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -#coverage: +# $Id$ Process this file with automake to produce Makefile.in # -#leakcheck: +# AM_CPPFLAGS = $(idb_cppflags) AM_CFLAGS = $(idb_cflags) AM_CXXFLAGS = $(idb_cxxflags) AM_LDFLAGS = $(idb_ldflags) +# AM_YFLAGS = -d -p qfe AM_LFLAGS = -i -Pqfe -olex.yy.c bin_PROGRAMS = QFE QFE_SOURCES = \ cseputils.cpp \ ddlstmts.cpp +# \ parsequery.cpp \ returnedrows.cpp \ sendcsep.cpp \ server.cpp \ socketio.cpp \ qfelexer.lpp \ qfeparser.ypp +# QFE_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS) QFE_LDFLAGS = @idb_common_ldflags@ @idb_write_libs@ +# @idb_exec_libs@ $(AM_LDFLAGS) BUILT_SOURCES = qfeparser.cpp qfelexer.cpp qfeparser.h # -#docs: +# test: # -#bootstrap: install-data-am +# coverage: +# +# leakcheck: +# +# docs: +# +# bootstrap: install-data-am # diff --git a/tools/rebuildEM/CMakeLists.txt b/tools/rebuildEM/CMakeLists.txt index 69edb6ab7..d7d907566 100644 --- a/tools/rebuildEM/CMakeLists.txt +++ b/tools/rebuildEM/CMakeLists.txt @@ -3,4 +3,8 @@ include_directories(${ENGINE_COMMON_INCLUDES}) set(rebuildEM_SRCS main.cpp rebuildEM.cpp) add_executable(mcsRebuildEM ${rebuildEM_SRCS}) target_link_libraries(mcsRebuildEM ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} boost_system boost_filesystem) -install(TARGETS mcsRebuildEM DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) +install( + TARGETS mcsRebuildEM + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/tools/rgprint/CMakeLists.txt b/tools/rgprint/CMakeLists.txt index 248bdba74..68b0f7bd9 100644 --- a/tools/rgprint/CMakeLists.txt +++ b/tools/rgprint/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(rgprint_SRCS rgprint.cpp) @@ -10,5 +8,8 @@ add_executable(rgprint ${rgprint_SRCS}) target_link_libraries(rgprint ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS}) -install(TARGETS rgprint DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) - +install( + TARGETS rgprint + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/tools/sendPlan/CMakeLists.txt b/tools/sendPlan/CMakeLists.txt index 560a6aa19..58adc132a 100644 --- a/tools/sendPlan/CMakeLists.txt +++ b/tools/sendPlan/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}) -include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(sendPlan_SRCS sendplan.cpp) @@ -12,33 +10,23 @@ target_link_libraries(sendPlan ${KDE4_KDECORE_LIBS}) install(TARGETS sendPlan ${INSTALL_TARGETS_DEFAULT_ARGS}) +# ########## install files ############### -########### install files ############### +# original Makefile.am contents follow: - - - -#original Makefile.am contents follow: - -## $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $ -### Process this file with automake to produce Makefile.in +# $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $ Process this file with automake to produce Makefile.in # -#AM_CPPFLAGS = $(idb_cppflags) -#AM_CFLAGS = $(idb_cflags) -#AM_CXXFLAGS = $(idb_cxxflags) -#AM_LDFLAGS = $(idb_ldflags) -#bin_PROGRAMS = sendPlan -#sendPlan_SOURCES = sendplan.cpp -#sendPlan_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS) -#sendPlan_LDFLAGS = @idb_common_ldflags@ @idb_exec_libs@ $(AM_LDFLAGS) +# AM_CPPFLAGS = $(idb_cppflags) AM_CFLAGS = $(idb_cflags) AM_CXXFLAGS = $(idb_cxxflags) AM_LDFLAGS = $(idb_ldflags) +# bin_PROGRAMS = sendPlan sendPlan_SOURCES = sendplan.cpp sendPlan_CPPFLAGS = @idb_common_includes@ $(AM_CPPFLAGS) +# sendPlan_LDFLAGS = @idb_common_ldflags@ @idb_exec_libs@ $(AM_LDFLAGS) # -#test: +# test: # -#coverage: +# coverage: # -#leakcheck: +# leakcheck: # -#docs: +# docs: # -#bootstrap: install-data-am +# bootstrap: install-data-am # diff --git a/tools/setConfig/CMakeLists.txt b/tools/setConfig/CMakeLists.txt index aa5d17883..a7c2429b9 100644 --- a/tools/setConfig/CMakeLists.txt +++ b/tools/setConfig/CMakeLists.txt @@ -1,7 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - -########### next target ############### +# ########## next target ############### set(setConfig_SRCS main.cpp) @@ -9,5 +8,8 @@ add_executable(mcsSetConfig ${setConfig_SRCS}) target_link_libraries(mcsSetConfig ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_EXEC_LIBS}) -install(TARGETS mcsSetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) - +install( + TARGETS mcsSetConfig + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/tools/viewtablelock/CMakeLists.txt b/tools/viewtablelock/CMakeLists.txt index dcc7a6db3..820c1fec4 100644 --- a/tools/viewtablelock/CMakeLists.txt +++ b/tools/viewtablelock/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(viewtablelock_SRCS viewtablelock.cpp) @@ -10,5 +8,8 @@ add_executable(viewtablelock ${viewtablelock_SRCS}) target_link_libraries(viewtablelock ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS}) -install(TARGETS viewtablelock DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) - +install( + TARGETS viewtablelock + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 42d57b415..9e7b74f4c 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -1,5 +1,4 @@ - -#add_subdirectory(boost_idb) +# add_subdirectory(boost_idb) add_subdirectory(startup) add_subdirectory(common) add_subdirectory(configcpp) diff --git a/utils/batchloader/CMakeLists.txt b/utils/batchloader/CMakeLists.txt index 2e0896b45..d724d20ad 100644 --- a/utils/batchloader/CMakeLists.txt +++ b/utils/batchloader/CMakeLists.txt @@ -1,7 +1,6 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) - -########### next target ############### +# ########## next target ############### set(batchloader_LIB_SRCS batchloader.cpp) @@ -11,4 +10,8 @@ add_dependencies(batchloader loggingcpp) target_link_libraries(batchloader ${NETSNMP_LIBRARIES}) -install(TARGETS batchloader DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS batchloader + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/utils/cacheutils/CMakeLists.txt b/utils/cacheutils/CMakeLists.txt index e10e13228..ef7d80c0d 100644 --- a/utils/cacheutils/CMakeLists.txt +++ b/utils/cacheutils/CMakeLists.txt @@ -1,7 +1,6 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) - -########### next target ############### +# ########## next target ############### set(cacheutils_LIB_SRCS cacheutils.cpp) @@ -9,4 +8,8 @@ columnstore_library(cacheutils ${cacheutils_LIB_SRCS}) add_dependencies(cacheutils loggingcpp) -install(TARGETS cacheutils DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS cacheutils + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/utils/cloudio/CMakeLists.txt b/utils/cloudio/CMakeLists.txt index afbfff0e1..b52a76fc4 100755 --- a/utils/cloudio/CMakeLists.txt +++ b/utils/cloudio/CMakeLists.txt @@ -1,28 +1,35 @@ include_directories(${ENGINE_COMMON_INCLUDES} ${ENGINE_SRC_DIR}/storage-manager/include) -set(cloudio_LIB_SRCS SMComm.cpp SMDataFile.cpp SMFileFactory.cpp SMFileSystem.cpp SocketPool.cpp cloud_plugin.cpp ../../datatypes/mcs_datatype.cpp) +set(cloudio_LIB_SRCS + SMComm.cpp + SMDataFile.cpp + SMFileFactory.cpp + SMFileSystem.cpp + SocketPool.cpp + cloud_plugin.cpp + ../../datatypes/mcs_datatype.cpp +) columnstore_library(cloudio ${cloudio_LIB_SRCS}) -# IDBDataFile currently depends on cloudio, which is backward. -# Once cloudio has been turned into a proper plugin for idbdatafile, -# we should be able to reverse the dependency like so: +# IDBDataFile currently depends on cloudio, which is backward. Once cloudio has been turned into a proper plugin for +# idbdatafile, we should be able to reverse the dependency like so: target_link_libraries(cloudio idbdatafile messageqcpp loggingcpp) -install(TARGETS cloudio DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS cloudio + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) add_executable(cloudio_component_test component_test.cpp) add_executable(end_to_end_test end_to_end_test.cpp) -# see the comment above and change this dependency to cloudio. Hm -# our lib dependencies seem not to be declared. Punting on that, -# maybe in the future we can have some poor unfortunate intern -# untangle all of that and declare lib dependencies properly. -# For now I'm going to do like the other executables, which means -# nearly everything AFAICT. +# see the comment above and change this dependency to cloudio. Hm our lib dependencies seem not to be declared. Punting +# on that, maybe in the future we can have some poor unfortunate intern untangle all of that and declare lib +# dependencies properly. For now I'm going to do like the other executables, which means nearly everything AFAICT. target_link_libraries(cloudio_component_test ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} cloudio) target_link_libraries(end_to_end_test ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} cloudio) -#target_link_libraries(cloudio_component_test cloudio) -# Copy end_to_end_test dataFile to binary directory -FILE(COPY testData DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/) +# target_link_libraries(cloudio_component_test cloudio) Copy end_to_end_test dataFile to binary directory +file(COPY testData DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/) diff --git a/utils/common/CMakeLists.txt b/utils/common/CMakeLists.txt index 2358590c7..678d70f17 100644 --- a/utils/common/CMakeLists.txt +++ b/utils/common/CMakeLists.txt @@ -1,6 +1,6 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) -########### next target ############### +# ########## next target ############### set(common_LIB_SRCS fixedallocator.cpp @@ -11,7 +11,8 @@ set(common_LIB_SRCS threadnaming.cpp utils_utf8.cpp statistics.cpp - string_prefixes.cpp) + string_prefixes.cpp +) columnstore_library(common ${common_LIB_SRCS}) @@ -19,4 +20,8 @@ target_link_libraries(common boost_filesystem) add_dependencies(common loggingcpp) -install(TARGETS common DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS common + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/utils/compress/CMakeLists.txt b/utils/compress/CMakeLists.txt index 4f2855c99..ca81e2204 100644 --- a/utils/compress/CMakeLists.txt +++ b/utils/compress/CMakeLists.txt @@ -1,12 +1,15 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ${SNAPPY_INCLUDE_DIR} ) +include_directories(${ENGINE_COMMON_INCLUDES} ${SNAPPY_INCLUDE_DIR}) -#hack for lz4 duplicate header -GET_PROPERTY(dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES) -LIST(REMOVE_ITEM dirs ${CMAKE_SOURCE_DIR}/include/providers) -SET_PROPERTY(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "${dirs}") +# hack for lz4 duplicate header +get_property( + dirs + DIRECTORY + PROPERTY INCLUDE_DIRECTORIES +) +list(REMOVE_ITEM dirs ${CMAKE_SOURCE_DIR}/include/providers) +set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "${dirs}") -set(compress_LIB_SRCS - idbcompress.cpp) +set(compress_LIB_SRCS idbcompress.cpp) add_definitions(-DNDEBUG) @@ -14,9 +17,13 @@ columnstore_library(compress ${compress_LIB_SRCS}) add_dependencies(compress loggingcpp external_boost) target_link_libraries(compress ${SNAPPY_LIBRARIES}) -IF(HAVE_LZ4) - MESSAGE_ONCE(STATUS "LINK WITH LZ4") +if(HAVE_LZ4) + message_once(STATUS "LINK WITH LZ4") target_link_libraries(compress ${LZ4_LIBRARIES}) -ENDIF() +endif() -install(TARGETS compress DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS compress + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/utils/configcpp/CMakeLists.txt b/utils/configcpp/CMakeLists.txt index 15dc8c1fb..c3a8f7bc1 100644 --- a/utils/configcpp/CMakeLists.txt +++ b/utils/configcpp/CMakeLists.txt @@ -1,6 +1,6 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) -########### next target ############### +# ########## next target ############### set(configcpp_LIB_SRCS configcpp.cpp xmlparser.cpp configstream.cpp) @@ -9,4 +9,8 @@ add_dependencies(configcpp loggingcpp) target_compile_definitions(configcpp PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS) -install(TARGETS configcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS configcpp + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/utils/configcpp/md5/CMakeLists.txt b/utils/configcpp/md5/CMakeLists.txt index 1b3488ab1..a89105613 100644 --- a/utils/configcpp/md5/CMakeLists.txt +++ b/utils/configcpp/md5/CMakeLists.txt @@ -1,24 +1,18 @@ - # # Not used # -# +# original Makefile.am contents follow: - -#original Makefile.am contents follow: - -#AM_CFLAGS = $(idb_cflags) -#noinst_LIBRARIES = libmd5.a -#libmd5_a_SOURCES = md5_dgst.c md5_one.c mem_clr.c +# AM_CFLAGS = $(idb_cflags) noinst_LIBRARIES = libmd5.a libmd5_a_SOURCES = md5_dgst.c md5_one.c mem_clr.c # -#test: +# test: # -#coverage: +# coverage: # -#leakcheck: +# leakcheck: # -#docs: +# docs: # -#bootstrap: +# bootstrap: # diff --git a/utils/dataconvert/CMakeLists.txt b/utils/dataconvert/CMakeLists.txt index 2b7e084fb..f41813740 100644 --- a/utils/dataconvert/CMakeLists.txt +++ b/utils/dataconvert/CMakeLists.txt @@ -1,7 +1,6 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) - -########### next target ############### +# ########## next target ############### set(dataconvert_LIB_SRCS dataconvert.cpp) @@ -9,4 +8,8 @@ columnstore_library(dataconvert ${dataconvert_LIB_SRCS}) add_dependencies(dataconvert loggingcpp) -install(TARGETS dataconvert DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS dataconvert + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/utils/ddlcleanup/CMakeLists.txt b/utils/ddlcleanup/CMakeLists.txt index 862331826..78756a2e7 100644 --- a/utils/ddlcleanup/CMakeLists.txt +++ b/utils/ddlcleanup/CMakeLists.txt @@ -1,7 +1,6 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) - -########### next target ############### +# ########## next target ############### set(ddlcleanuputil_LIB_SRCS ddlcleanuputil.cpp) @@ -11,4 +10,8 @@ add_dependencies(ddlcleanuputil loggingcpp) target_link_libraries(ddlcleanuputil ${NETSNMP_LIBRARIES}) -install(TARGETS ddlcleanuputil DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS ddlcleanuputil + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/utils/idbdatafile/CMakeLists.txt b/utils/idbdatafile/CMakeLists.txt index 8d184652a..b22023242 100644 --- a/utils/idbdatafile/CMakeLists.txt +++ b/utils/idbdatafile/CMakeLists.txt @@ -1,6 +1,6 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ../cloudio) +include_directories(${ENGINE_COMMON_INCLUDES} ../cloudio) -########### next target ############### +# ########## next target ############### set(idbdatafile_LIB_SRCS BufferedFile.cpp @@ -10,7 +10,8 @@ set(idbdatafile_LIB_SRCS IDBLogger.cpp IDBPolicy.cpp PosixFileSystem.cpp - UnbufferedFile.cpp) + UnbufferedFile.cpp +) columnstore_library(idbdatafile ${idbdatafile_LIB_SRCS}) @@ -18,4 +19,8 @@ target_link_libraries(idbdatafile ${NETSNMP_LIBRARIES} ${ENGINE_OAM_LIBS} boost_ target_compile_definitions(idbdatafile PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS) -install(TARGETS idbdatafile DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS idbdatafile + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/utils/joiner/CMakeLists.txt b/utils/joiner/CMakeLists.txt index 1892205eb..35f241a46 100644 --- a/utils/joiner/CMakeLists.txt +++ b/utils/joiner/CMakeLists.txt @@ -1,7 +1,6 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) - -########### next target ############### +# ########## next target ############### set(joiner_LIB_SRCS tuplejoiner.cpp joinpartition.cpp) @@ -9,4 +8,8 @@ columnstore_library(joiner ${joiner_LIB_SRCS}) add_dependencies(joiner loggingcpp) -install(TARGETS joiner DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS joiner + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/utils/libmarias3/CMakeLists.txt b/utils/libmarias3/CMakeLists.txt index 12be11618..21b8fc7a9 100644 --- a/utils/libmarias3/CMakeLists.txt +++ b/utils/libmarias3/CMakeLists.txt @@ -1,6 +1,10 @@ -set(S3API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libmarias3 CACHE INTERNAL "S3API_DIR") +set(S3API_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/libmarias3 + CACHE INTERNAL "S3API_DIR" +) -SET(S3_SOURCES ${S3API_DIR}/src/debug.c +set(S3_SOURCES + ${S3API_DIR}/src/debug.c ${S3API_DIR}/src/error.c ${S3API_DIR}/src/marias3.c ${S3API_DIR}/src/request.c @@ -8,17 +12,22 @@ SET(S3_SOURCES ${S3API_DIR}/src/debug.c ${S3API_DIR}/src/sha256.c ${S3API_DIR}/src/sha256-internal.c ${S3API_DIR}/src/xml.c - ${S3API_DIR}/src/assume_role.c) + ${S3API_DIR}/src/assume_role.c +) -ADD_LIBRARY(marias3 SHARED ${S3_SOURCES}) +add_library(marias3 SHARED ${S3_SOURCES}) -TARGET_LINK_LIBRARIES(marias3 curl m) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${S3API_DIR}) +target_link_libraries(marias3 curl m) +include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${S3API_DIR}) add_definitions(-D_GNU_SOURCE) -set(S3API_DEPS marias3 curl CACHE INTERNAL "S3API_DEPS") +set(S3API_DEPS + marias3 curl + CACHE INTERNAL "S3API_DEPS" +) -install(TARGETS marias3 +install( + TARGETS marias3 DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine ) diff --git a/utils/libmysql_client/CMakeLists.txt b/utils/libmysql_client/CMakeLists.txt index 7503ddb21..86254147a 100644 --- a/utils/libmysql_client/CMakeLists.txt +++ b/utils/libmysql_client/CMakeLists.txt @@ -1,11 +1,9 @@ -include_directories(BEFORE - ${LIBMARIADB_BININC_DIR} - ${LIBMARIADB_SRCINC_DIR}) +include_directories(BEFORE ${LIBMARIADB_BININC_DIR} ${LIBMARIADB_SRCINC_DIR}) add_definitions(-DMYSQL_SERVICE_THD_TIMEZONE_INCLUDED) -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) -########### next target ############### +# ########## next target ############### set(libmysql_client_LIB_SRCS libmysql_client.cpp) @@ -14,4 +12,8 @@ target_link_libraries(libmysql_client ${MARIADB_CLIENT_LIBS}) add_dependencies(libmysql_client loggingcpp) -install(TARGETS libmysql_client DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS libmysql_client + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/utils/loggingcpp/CMakeLists.txt b/utils/loggingcpp/CMakeLists.txt index b951f4b2b..3faab8775 100644 --- a/utils/loggingcpp/CMakeLists.txt +++ b/utils/loggingcpp/CMakeLists.txt @@ -1,23 +1,26 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) -########### next target ############### -ADD_CUSTOM_COMMAND( +# ########## next target ############### +add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/messageids.h - COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/genMsgId.pl < ${CMAKE_CURRENT_SOURCE_DIR}/MessageFile.txt > messageids-temp.h + COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/genMsgId.pl < ${CMAKE_CURRENT_SOURCE_DIR}/MessageFile.txt > + messageids-temp.h COMMAND ${CMAKE_COMMAND} -E copy_if_different messageids-temp.h messageids.h DEPENDS genMsgId.pl - ) -ADD_CUSTOM_COMMAND( +) +add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/errorids.h - COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/genErrId.pl < ${CMAKE_CURRENT_SOURCE_DIR}/ErrorMessage.txt > errorids-temp.h + COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/genErrId.pl < ${CMAKE_CURRENT_SOURCE_DIR}/ErrorMessage.txt > + errorids-temp.h COMMAND ${CMAKE_COMMAND} -E copy_if_different errorids-temp.h errorids.h DEPENDS genErrId.pl - ) +) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/messageids.h PROPERTIES GENERATED TRUE) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/errorids.h PROPERTIES GENERATED TRUE) -columnstore_library(loggingcpp +columnstore_library( + loggingcpp message.cpp messagelog.cpp logger.cpp @@ -30,6 +33,14 @@ columnstore_library(loggingcpp ) add_dependencies(loggingcpp external_boost) -install(TARGETS loggingcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS loggingcpp + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) -install(FILES MessageFile.txt ErrorMessage.txt DESTINATION ${ENGINE_SYSCONFDIR}/columnstore COMPONENT columnstore-engine) +install( + FILES MessageFile.txt ErrorMessage.txt + DESTINATION ${ENGINE_SYSCONFDIR}/columnstore + COMPONENT columnstore-engine +) diff --git a/utils/messageqcpp/CMakeLists.txt b/utils/messageqcpp/CMakeLists.txt index ca7f15a09..598824c5a 100644 --- a/utils/messageqcpp/CMakeLists.txt +++ b/utils/messageqcpp/CMakeLists.txt @@ -1,7 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - -########### next target ############### +# ########## next target ############### set(messageqcpp_LIB_SRCS messagequeue.cpp @@ -19,5 +18,4 @@ add_library(messageqcpp STATIC ${messageqcpp_LIB_SRCS}) add_dependencies(messageqcpp loggingcpp) -#We don't isntall static library -#install(TARGETS messageqcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +# We don't isntall static library install(TARGETS messageqcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) diff --git a/utils/multicast/CMakeLists.txt b/utils/multicast/CMakeLists.txt index 23ddb2d6c..7d5016336 100644 --- a/utils/multicast/CMakeLists.txt +++ b/utils/multicast/CMakeLists.txt @@ -1,48 +1,33 @@ - # # Not used # -# +# original Makefile.am contents follow: - -#original Makefile.am contents follow: - -## Copyright (C) 2014 InfiniDB, Inc. -## -## This program is free software; you can redistribute it and/or -## modify it under the terms of the GNU General Public License -## as published by the Free Software Foundation; version 2 of -## the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -## MA 02110-1301, USA. +# Copyright (C) 2014 InfiniDB, Inc. # -## $Id$ -### Process this file with automake to produce Makefile.in +# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; version 2 of the License. # -#AM_CPPFLAGS = $(idb_common_includes) $(idb_cppflags) -#AM_CFLAGS = $(idb_cflags) -#AM_CXXFLAGS = $(idb_cxxflags) -#AM_LDFLAGS = -version-info 1:0:0 $(idb_ldflags) -#lib_LTLIBRARIES = libmulticast.la -#libmulticast_la_SOURCES = multicast.cpp -#include_HEADERS = multicast.h +# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -#test: +# You should have received a copy of the GNU General Public License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -#coverage: +# $Id$ Process this file with automake to produce Makefile.in # -#leakcheck: +# AM_CPPFLAGS = $(idb_common_includes) $(idb_cppflags) AM_CFLAGS = $(idb_cflags) AM_CXXFLAGS = $(idb_cxxflags) +# AM_LDFLAGS = -version-info 1:0:0 $(idb_ldflags) lib_LTLIBRARIES = libmulticast.la libmulticast_la_SOURCES = +# multicast.cpp include_HEADERS = multicast.h # -#docs: +# test: # -#bootstrap: install-data-am +# coverage: +# +# leakcheck: +# +# docs: +# +# bootstrap: install-data-am # diff --git a/utils/pron/CMakeLists.txt b/utils/pron/CMakeLists.txt index 8357afc1f..e02c6d916 100644 --- a/utils/pron/CMakeLists.txt +++ b/utils/pron/CMakeLists.txt @@ -1,7 +1,6 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) set(pron_LIB_SRCS pron.cpp) add_library(pron STATIC ${pron_LIB_SRCS}) target_link_libraries(pron messageqcpp loggingcpp) -#We don't isntall static library -#install(TARGETS pron DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +# We don't isntall static library install(TARGETS pron DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) diff --git a/utils/querystats/CMakeLists.txt b/utils/querystats/CMakeLists.txt index 0a4c05240..609bd8473 100644 --- a/utils/querystats/CMakeLists.txt +++ b/utils/querystats/CMakeLists.txt @@ -1,11 +1,9 @@ -include_directories(BEFORE - ${LIBMARIADB_BININC_DIR} - ${LIBMARIADB_SRCINC_DIR}) +include_directories(BEFORE ${LIBMARIADB_BININC_DIR} ${LIBMARIADB_SRCINC_DIR}) add_definitions(-DMYSQL_SERVICE_THD_TIMEZONE_INCLUDED) -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) -########### next target ############### +# ########## next target ############### set(querystats_LIB_SRCS querystats.cpp) @@ -13,4 +11,8 @@ columnstore_library(querystats ${querystats_LIB_SRCS}) add_dependencies(querystats loggingcpp) -install(TARGETS querystats DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS querystats + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/utils/querytele/CMakeLists.txt b/utils/querytele/CMakeLists.txt index 2ba5a743c..f9d3a3926 100644 --- a/utils/querytele/CMakeLists.txt +++ b/utils/querytele/CMakeLists.txt @@ -1,19 +1,18 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) +# ########## next target ############### -########### next target ############### - -set(querytele_LIB_SRCS - querytele.cpp - queryteleclient.cpp - querytele_constants.cpp - querytele_types.cpp - QueryTeleService.cpp - queryteleprotoimpl.cpp) +set(querytele_LIB_SRCS querytele.cpp queryteleclient.cpp querytele_constants.cpp querytele_types.cpp + QueryTeleService.cpp queryteleprotoimpl.cpp +) columnstore_library(querytele ${querytele_LIB_SRCS}) add_dependencies(querytele external_boost external_thrift) target_include_directories(querytele PRIVATE ${THRIFT_INCLUDE_DIRS}) target_link_libraries(querytele ${THRIFT_LIBRARY}) -install(TARGETS querytele DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS querytele + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/utils/regr/CMakeLists.txt b/utils/regr/CMakeLists.txt index 45ab3a5d3..3532cc255 100755 --- a/utils/regr/CMakeLists.txt +++ b/utils/regr/CMakeLists.txt @@ -1,26 +1,44 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} - ../../dbcon/mysql ) - -########### next target ############### +include_directories(${ENGINE_COMMON_INCLUDES} ../../dbcon/mysql) -set(regr_LIB_SRCS regr_avgx.cpp regr_avgy.cpp regr_count.cpp regr_slope.cpp regr_intercept.cpp regr_r2.cpp corr.cpp regr_sxx.cpp regr_syy.cpp regr_sxy.cpp covar_pop.cpp covar_samp.cpp moda.cpp) +# ########## next target ############### + +set(regr_LIB_SRCS + regr_avgx.cpp + regr_avgy.cpp + regr_count.cpp + regr_slope.cpp + regr_intercept.cpp + regr_r2.cpp + corr.cpp + regr_sxx.cpp + regr_syy.cpp + regr_sxy.cpp + covar_pop.cpp + covar_samp.cpp + moda.cpp +) add_definitions(-DMYSQL_DYNAMIC_PLUGIN) -columnstore_library(regr ${regr_LIB_SRCS} ) +columnstore_library(regr ${regr_LIB_SRCS}) add_dependencies(regr loggingcpp) -install(TARGETS regr DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) - - +install( + TARGETS regr + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) set(regr_mysql_LIB_SRCS regrmysql.cpp modamysql.cpp) columnstore_library(regr_mysql ${regr_mysql_LIB_SRCS}) add_dependencies(regr_mysql external_boost) -install(TARGETS regr_mysql DESTINATION ${MARIADB_PLUGINDIR} COMPONENT columnstore-engine) +install( + TARGETS regr_mysql + DESTINATION ${MARIADB_PLUGINDIR} + COMPONENT columnstore-engine +) -set_target_properties(regr_mysql PROPERTIES - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../../) +set_target_properties(regr_mysql PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../../) diff --git a/utils/rowgroup/CMakeLists.txt b/utils/rowgroup/CMakeLists.txt index 2a20400b1..75f406bc8 100644 --- a/utils/rowgroup/CMakeLists.txt +++ b/utils/rowgroup/CMakeLists.txt @@ -1,11 +1,10 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) - -########### next target ############### +# ########## next target ############### set(rowgroup_LIB_SRCS rowaggregation.cpp rowgroup.cpp rowstorage.cpp) -#librowgroup_la_CXXFLAGS = $(march_flags) $(AM_CXXFLAGS) +# librowgroup_la_CXXFLAGS = $(march_flags) $(AM_CXXFLAGS) columnstore_library(rowgroup ${rowgroup_LIB_SRCS}) @@ -13,4 +12,8 @@ add_dependencies(rowgroup loggingcpp external_boost) target_link_libraries(rowgroup ${NETSNMP_LIBRARIES} funcexp) -install(TARGETS rowgroup DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS rowgroup + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/utils/rwlock/CMakeLists.txt b/utils/rwlock/CMakeLists.txt index 5858c0f84..03dda2f2c 100644 --- a/utils/rwlock/CMakeLists.txt +++ b/utils/rwlock/CMakeLists.txt @@ -1,8 +1,12 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) set(rwlock_LIB_SRCS rwlock.cpp rwlock_local.cpp) columnstore_library(rwlock ${rwlock_LIB_SRCS}) add_dependencies(rwlock external_boost) -install(TARGETS rwlock DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS rwlock + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/utils/startup/CMakeLists.txt b/utils/startup/CMakeLists.txt index 3a84c750e..c6284106e 100644 --- a/utils/startup/CMakeLists.txt +++ b/utils/startup/CMakeLists.txt @@ -1,8 +1,8 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) -ADD_DEFINITIONS(-fPIC -DPIC) +add_definitions(-fPIC -DPIC) columnstore_library(idbboot installdir.cpp) add_dependencies(idbboot external_boost) -INSTALL(TARGETS idbboot DESTINATION ${ENGINE_LIBDIR}) +install(TARGETS idbboot DESTINATION ${ENGINE_LIBDIR}) diff --git a/utils/threadpool/CMakeLists.txt b/utils/threadpool/CMakeLists.txt index c845c207c..90e919289 100644 --- a/utils/threadpool/CMakeLists.txt +++ b/utils/threadpool/CMakeLists.txt @@ -1,10 +1,13 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) - -########### next target ############### +# ########## next target ############### set(threadpool_LIB_SRCS weightedthreadpool.cpp threadpool.cpp prioritythreadpool.cpp fair_threadpool.cpp) columnstore_library(threadpool ${threadpool_LIB_SRCS}) add_dependencies(threadpool loggingcpp external_boost) target_link_libraries(threadpool boost_chrono) -install(TARGETS threadpool DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS threadpool + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/utils/windowfunction/CMakeLists.txt b/utils/windowfunction/CMakeLists.txt index b322a83b5..85e253c56 100755 --- a/utils/windowfunction/CMakeLists.txt +++ b/utils/windowfunction/CMakeLists.txt @@ -1,7 +1,6 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) - -########### next target ############### +# ########## next target ############### set(windowfunction_LIB_SRCS framebound.cpp @@ -21,10 +20,15 @@ set(windowfunction_LIB_SRCS wf_row_number.cpp wf_stats.cpp wf_sum_avg.cpp - wf_udaf.cpp) + wf_udaf.cpp +) columnstore_library(windowfunction ${windowfunction_LIB_SRCS}) add_dependencies(windowfunction loggingcpp) -install(TARGETS windowfunction DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS windowfunction + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/versioning/BRM/CMakeLists.txt b/versioning/BRM/CMakeLists.txt index d3c096e42..3f5d032da 100644 --- a/versioning/BRM/CMakeLists.txt +++ b/versioning/BRM/CMakeLists.txt @@ -1,11 +1,9 @@ - -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/shmkeys.cpp.in" "${CMAKE_CURRENT_SOURCE_DIR}/shmkeys.cpp" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/brmshmimpl.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/brmshmimpl.h" @ONLY) - -########### next target ############### +# ########## next target ############### set(brm_LIB_SRCS autoincrementmanager.cpp @@ -32,27 +30,34 @@ set(brm_LIB_SRCS undoable.cpp vbbm.cpp vss.cpp - ../../datatypes/mcs_datatype.cpp) + ../../datatypes/mcs_datatype.cpp +) columnstore_library(brm ${brm_LIB_SRCS}) add_dependencies(brm loggingcpp) -install(TARGETS brm DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS brm + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) - -########### next target ############### +# ########## next target ############### set(controllernode_SRCS masternode.cpp masterdbrmnode.cpp ../../utils/common/crashtrace.cpp) add_executable(controllernode ${controllernode_SRCS}) -target_link_libraries(controllernode ${ENGINE_LDFLAGS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ) +target_link_libraries(controllernode ${ENGINE_LDFLAGS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS controllernode DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) +install( + TARGETS controllernode + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) - -########### next target ############### +# ########## next target ############### set(workernode_SRCS slavenode.cpp ../../utils/common/crashtrace.cpp) @@ -60,10 +65,13 @@ add_executable(workernode ${workernode_SRCS}) target_link_libraries(workernode ${ENGINE_LDFLAGS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS workernode DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) +install( + TARGETS workernode + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) - -########### next target ############### +# ########## next target ############### set(dbrmctl_SRCS dbrmctl.cpp) @@ -71,10 +79,13 @@ add_executable(dbrmctl ${dbrmctl_SRCS}) target_link_libraries(dbrmctl ${ENGINE_LDFLAGS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS dbrmctl DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) +install( + TARGETS dbrmctl + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) - -########### next target ############### +# ########## next target ############### set(reset_locks_SRCS reset_locks.cpp) @@ -82,10 +93,13 @@ add_executable(reset_locks ${reset_locks_SRCS}) target_link_libraries(reset_locks ${ENGINE_LDFLAGS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES}) -install(TARGETS reset_locks DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) +install( + TARGETS reset_locks + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) - -########### next target ############### +# ########## next target ############### set(rollback_SRCS rollback.cpp) @@ -93,10 +107,13 @@ add_executable(rollback ${rollback_SRCS}) target_link_libraries(rollback ${ENGINE_LDFLAGS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES}) -install(TARGETS rollback DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) +install( + TARGETS rollback + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) - -########### next target ############### +# ########## next target ############### set(save_brm_SRCS save_brm.cpp) @@ -104,10 +121,13 @@ add_executable(save_brm ${save_brm_SRCS}) target_link_libraries(save_brm ${ENGINE_LDFLAGS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES}) -install(TARGETS save_brm DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) +install( + TARGETS save_brm + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) - -########### next target ############### +# ########## next target ############### set(load_brm_SRCS load_brm.cpp) @@ -115,16 +135,50 @@ add_executable(load_brm ${load_brm_SRCS}) target_link_libraries(load_brm ${ENGINE_LDFLAGS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES}) -install(TARGETS load_brm DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) +install( + TARGETS load_brm + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) add_executable(mcs-load-em load_em.cpp) -target_link_libraries(mcs-load-em ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES}) -install(TARGETS mcs-load-em DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) +target_link_libraries( + mcs-load-em ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES} +) +install( + TARGETS mcs-load-em + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) add_executable(mcs-load-brm-from-file load_brm_from_file.cpp) -target_link_libraries(mcs-load-brm-from-file ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES} boost_program_options) -install(TARGETS mcs-load-brm-from-file DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) +target_link_libraries( + mcs-load-brm-from-file + ${ENGINE_LDFLAGS} + ${MARIADB_CLIENT_LIBS} + ${ENGINE_OAM_LIBS} + ${ENGINE_EXEC_LIBS} + ${NETSNMP_LIBRARIES} + boost_program_options +) +install( + TARGETS mcs-load-brm-from-file + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) add_executable(mcs-shmem-locks shmem_locks.cpp) -target_link_libraries(mcs-shmem-locks ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES} boost_program_options) -install(TARGETS mcs-shmem-locks DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) \ No newline at end of file +target_link_libraries( + mcs-shmem-locks + ${ENGINE_LDFLAGS} + ${MARIADB_CLIENT_LIBS} + ${ENGINE_OAM_LIBS} + ${ENGINE_EXEC_LIBS} + ${NETSNMP_LIBRARIES} + boost_program_options +) +install( + TARGETS mcs-shmem-locks + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/versioning/CMakeLists.txt b/versioning/CMakeLists.txt index 7856a9972..66465e00d 100644 --- a/versioning/CMakeLists.txt +++ b/versioning/CMakeLists.txt @@ -1,2 +1 @@ - add_subdirectory(BRM) diff --git a/writeengine/CMakeLists.txt b/writeengine/CMakeLists.txt index 02705c71d..834ef63c4 100644 --- a/writeengine/CMakeLists.txt +++ b/writeengine/CMakeLists.txt @@ -1,5 +1,4 @@ - -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) add_subdirectory(shared) add_subdirectory(dictionary) @@ -11,46 +10,32 @@ add_subdirectory(redistribute) add_subdirectory(splitter) add_subdirectory(server) +# ########## install files ############### -########### install files ############### +# original Makefile.am contents follow: - - - -#original Makefile.am contents follow: - -## Copyright (C) 2014 InfiniDB, Inc. -## -## This program is free software; you can redistribute it and/or -## modify it under the terms of the GNU General Public License -## as published by the Free Software Foundation; version 2 of -## the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -## MA 02110-1301, USA. +# Copyright (C) 2014 InfiniDB, Inc. # -## $Id: Makefile.am 878 2009-04-03 20:34:32Z rdempsey $ +# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; version 2 of the License. # -#SUBDIRS = shared dictionary xml wrapper bulk client redistribute splitter \ -# server +# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -#test: +# You should have received a copy of the GNU General Public License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -#coverage: +# $Id: Makefile.am 878 2009-04-03 20:34:32Z rdempsey $ # -#leakcheck: +# SUBDIRS = shared dictionary xml wrapper bulk client redistribute splitter \ server # -#docs: +# test: # -#bootstrap: -# for subdir in $(SUBDIRS); \ -# do $(MAKE) -C $$subdir bootstrap || exit $$?; \ -# done +# coverage: +# +# leakcheck: +# +# docs: +# +# bootstrap: for subdir in $(SUBDIRS); \ do $(MAKE) -C $$subdir bootstrap || exit $$?; \ done # diff --git a/writeengine/bulk/CMakeLists.txt b/writeengine/bulk/CMakeLists.txt index 4b722f5d7..6ed311452 100644 --- a/writeengine/bulk/CMakeLists.txt +++ b/writeengine/bulk/CMakeLists.txt @@ -1,8 +1,8 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ${S3API_DIR} ) +include_directories(${ENGINE_COMMON_INCLUDES} ${S3API_DIR}) link_directories(${CMAKE_BINARY_DIR}/lib) -########### next target ############### +# ########## next target ############### set(we_bulk_STAT_SRCS we_brmreporter.cpp @@ -22,23 +22,36 @@ set(we_bulk_STAT_SRCS we_extentstripealloc.cpp we_tableinfo.cpp we_tempxmlgendata.cpp - we_workers.cpp) + we_workers.cpp +) -ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64) +add_definitions(-D_FILE_OFFSET_BITS=64) columnstore_library(we_bulk ${we_bulk_STAT_SRCS}) add_dependencies(we_bulk loggingcpp) target_link_libraries(we_bulk ${NETSNMP_LIBRARIES}) -REMOVE_DEFINITIONS(-D_FILE_OFFSET_BITS=64) +remove_definitions(-D_FILE_OFFSET_BITS=64) -########### next target ############### +# ########## next target ############### set(cpimport.bin_SRCS cpimport.cpp) add_executable(cpimport.bin ${cpimport.bin_SRCS}) add_dependencies(cpimport.bin marias3) -target_link_libraries(cpimport.bin ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS} ${S3API_DEPS} we_bulk we_xml) +target_link_libraries( + cpimport.bin + ${ENGINE_LDFLAGS} + ${NETSNMP_LIBRARIES} + ${ENGINE_WRITE_LIBS} + ${S3API_DEPS} + we_bulk + we_xml +) -install(TARGETS cpimport.bin DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) +install( + TARGETS cpimport.bin + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/writeengine/client/CMakeLists.txt b/writeengine/client/CMakeLists.txt index 8e2886980..f7b64e7e0 100644 --- a/writeengine/client/CMakeLists.txt +++ b/writeengine/client/CMakeLists.txt @@ -1,7 +1,6 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) - -########### next target ############### +# ########## next target ############### set(writeengineclient_LIB_SRCS we_clients.cpp we_ddlcommandclient.cpp we_dmlcommandclient.cpp) @@ -11,4 +10,8 @@ add_dependencies(writeengineclient loggingcpp) target_link_libraries(writeengineclient ${NETSNMP_LIBRARIES}) -install(TARGETS writeengineclient DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS writeengineclient + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/writeengine/dictionary/CMakeLists.txt b/writeengine/dictionary/CMakeLists.txt index 37317d2f1..569964394 100644 --- a/writeengine/dictionary/CMakeLists.txt +++ b/writeengine/dictionary/CMakeLists.txt @@ -1,3 +1,3 @@ -########### install files ############### +# ########## install files ############### -install(FILES we_dctnry.h DESTINATION include) +install(FILES we_dctnry.h DESTINATION include) diff --git a/writeengine/index/CMakeLists.txt b/writeengine/index/CMakeLists.txt index af4d673a8..4913a33c9 100644 --- a/writeengine/index/CMakeLists.txt +++ b/writeengine/index/CMakeLists.txt @@ -1,44 +1,33 @@ +include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}) -include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) +# ########## install files ############### +install(FILES we_indexlist.h we_freemgr.h we_indextree.h DESTINATION include) -########### install files ############### +# original Makefile.am contents follow: -install(FILES we_indexlist.h we_freemgr.h we_indextree.h DESTINATION include) - - - -#original Makefile.am contents follow: - -## Copyright (C) 2014 InfiniDB, Inc. -## -## This program is free software; you can redistribute it and/or -## modify it under the terms of the GNU General Public License -## as published by the Free Software Foundation; version 2 of -## the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -## MA 02110-1301, USA. +# Copyright (C) 2014 InfiniDB, Inc. # -## $Id: Makefile.am 864 2009-04-02 19:22:49Z rdempsey $ -### Process this file with automake to produce Makefile.in +# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; version 2 of the License. # -#include_HEADERS = we_indexlist.h we_freemgr.h we_indextree.h +# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -#test: +# You should have received a copy of the GNU General Public License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -#coverage: +# $Id: Makefile.am 864 2009-04-02 19:22:49Z rdempsey $ Process this file with automake to produce Makefile.in # -#leakcheck: +# include_HEADERS = we_indexlist.h we_freemgr.h we_indextree.h # -#docs: +# test: # -#bootstrap: install-data-am +# coverage: +# +# leakcheck: +# +# docs: +# +# bootstrap: install-data-am # diff --git a/writeengine/redistribute/CMakeLists.txt b/writeengine/redistribute/CMakeLists.txt index 286f957e9..9b847bdda 100644 --- a/writeengine/redistribute/CMakeLists.txt +++ b/writeengine/redistribute/CMakeLists.txt @@ -1,12 +1,10 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) -########### next target ############### +# ########## next target ############### -set(writeengineredistribute_LIB_SRCS - we_redistribute.cpp - we_redistributecontrol.cpp - we_redistributecontrolthread.cpp - we_redistributeworkerthread.cpp) +set(writeengineredistribute_LIB_SRCS we_redistribute.cpp we_redistributecontrol.cpp we_redistributecontrolthread.cpp + we_redistributeworkerthread.cpp +) columnstore_library(writeengineredistribute ${writeengineredistribute_LIB_SRCS}) @@ -16,5 +14,8 @@ target_link_libraries(writeengineredistribute ${NETSNMP_LIBRARIES}) target_compile_definitions(writeengineredistribute PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS) - -install(TARGETS writeengineredistribute DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS writeengineredistribute + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/writeengine/server/CMakeLists.txt b/writeengine/server/CMakeLists.txt index c9ce0c6f6..2d148cac5 100644 --- a/writeengine/server/CMakeLists.txt +++ b/writeengine/server/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES}) -include_directories( ${ENGINE_COMMON_INCLUDES} ) - - -########### next target ############### +# ########## next target ############### set(WriteEngineServer_SRCS we_server.cpp @@ -16,13 +14,19 @@ set(WriteEngineServer_SRCS we_cpifeederthread.cpp we_getfilesizes.cpp ../../utils/common/crashtrace.cpp - ../../datatypes/mcs_datatype.cpp) + ../../datatypes/mcs_datatype.cpp +) add_executable(WriteEngineServer ${WriteEngineServer_SRCS}) add_dependencies(WriteEngineServer loggingcpp) -target_link_libraries(WriteEngineServer ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS} threadpool writeengineredistribute) - -install(TARGETS WriteEngineServer DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) +target_link_libraries( + WriteEngineServer ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS} threadpool writeengineredistribute +) +install( + TARGETS WriteEngineServer + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/writeengine/shared/CMakeLists.txt b/writeengine/shared/CMakeLists.txt index f678d3690..c278967ab 100644 --- a/writeengine/shared/CMakeLists.txt +++ b/writeengine/shared/CMakeLists.txt @@ -1,4 +1,29 @@ +# ########## install files ############### -########### install files ############### - -install(FILES we_index.h we_define.h we_type.h we_fileop.h we_blockop.h we_dbfileop.h we_obj.h we_log.h we_simplesyslog.h we_convertor.h we_brm.h we_macro.h we_config.h we_cache.h we_stats.h we_bulkrollbackmgr.h we_typeext.h we_chunkmanager.h we_bulkrollbackfilecompressed.h we_bulkrollbackfilecompressedhdfs.h we_bulkrollbackfile.h we_rbmetawriter.h we_dbrootextenttracker.h we_confirmhdfsdbfile.h DESTINATION include) +install( + FILES we_index.h + we_define.h + we_type.h + we_fileop.h + we_blockop.h + we_dbfileop.h + we_obj.h + we_log.h + we_simplesyslog.h + we_convertor.h + we_brm.h + we_macro.h + we_config.h + we_cache.h + we_stats.h + we_bulkrollbackmgr.h + we_typeext.h + we_chunkmanager.h + we_bulkrollbackfilecompressed.h + we_bulkrollbackfilecompressedhdfs.h + we_bulkrollbackfile.h + we_rbmetawriter.h + we_dbrootextenttracker.h + we_confirmhdfsdbfile.h + DESTINATION include +) diff --git a/writeengine/splitter/CMakeLists.txt b/writeengine/splitter/CMakeLists.txt index c84b20dfa..d5a3aed50 100644 --- a/writeengine/splitter/CMakeLists.txt +++ b/writeengine/splitter/CMakeLists.txt @@ -1,8 +1,6 @@ +include_directories(${ENGINE_COMMON_INCLUDES} ${S3API_DIR}) -include_directories( ${ENGINE_COMMON_INCLUDES} ${S3API_DIR} ) - - -########### next target ############### +# ########## next target ############### set(cpimport_SRCS we_splitterapp.cpp @@ -13,13 +11,25 @@ set(cpimport_SRCS we_splclient.cpp we_brmupdater.cpp we_tablelockgrabber.cpp - we_xmlgetter.cpp) + we_xmlgetter.cpp +) add_executable(cpimport ${cpimport_SRCS}) add_dependencies(cpimport loggingcpp) -target_link_libraries(cpimport ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS} batchloader threadpool marias3) - -install(TARGETS cpimport DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) +target_link_libraries( + cpimport + ${ENGINE_LDFLAGS} + ${NETSNMP_LIBRARIES} + ${ENGINE_WRITE_LIBS} + batchloader + threadpool + marias3 +) +install( + TARGETS cpimport + DESTINATION ${ENGINE_BINDIR} + COMPONENT columnstore-engine +) diff --git a/writeengine/wrapper/CMakeLists.txt b/writeengine/wrapper/CMakeLists.txt index 8d5f50d36..57d6b09ce 100644 --- a/writeengine/wrapper/CMakeLists.txt +++ b/writeengine/wrapper/CMakeLists.txt @@ -1,7 +1,6 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) - -########### next target ############### +# ########## next target ############### set(writeengine_LIB_SRCS writeengine.cpp @@ -32,7 +31,8 @@ set(writeengine_LIB_SRCS ../xml/we_xmlop.cpp ../xml/we_xmljob.cpp ../xml/we_xmlgendata.cpp - ../xml/we_xmlgenproc.cpp) + ../xml/we_xmlgenproc.cpp +) add_definitions(-D_FILE_OFFSET_BITS=64) @@ -42,4 +42,8 @@ add_dependencies(writeengine loggingcpp) target_link_libraries(writeengine ${NETSNMP_LIBRARIES}) -install(TARGETS writeengine DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) +install( + TARGETS writeengine + DESTINATION ${ENGINE_LIBDIR} + COMPONENT columnstore-engine +) diff --git a/writeengine/xml/CMakeLists.txt b/writeengine/xml/CMakeLists.txt index 03626d43b..a23e1e958 100644 --- a/writeengine/xml/CMakeLists.txt +++ b/writeengine/xml/CMakeLists.txt @@ -1,13 +1,8 @@ -include_directories( ${ENGINE_COMMON_INCLUDES} ) +include_directories(${ENGINE_COMMON_INCLUDES}) +# ########## next target ############### -########### next target ############### - -set(we_xml_STAT_SRCS - we_xmlop.cpp - we_xmljob.cpp - we_xmlgendata.cpp - we_xmlgenproc.cpp) +set(we_xml_STAT_SRCS we_xmlop.cpp we_xmljob.cpp we_xmlgendata.cpp we_xmlgenproc.cpp) add_definitions(-D_FILE_OFFSET_BITS=64) @@ -15,4 +10,4 @@ columnstore_library(we_xml ${we_xml_STAT_SRCS}) add_dependencies(we_xml loggingcpp) -INSTALL(TARGETS we_xml DESTINATION ${ENGINE_LIBDIR}) +install(TARGETS we_xml DESTINATION ${ENGINE_LIBDIR})