database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-160 MCOL-262 CMake Build Fixes for out-of-tree builds and engine RPMS

Browse Source
This commit is contained in:
Ben Thompson
2016-09-22 10:14:18 -04:00
parent 1cb95cee72
commit 7d3cd26af9
82 changed files with 329 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -98,3 +98,8 @@ utils/loggingcpp/messageids.h
CPackConfig.cmake
CPackSourceConfig.cmake
build/columnstore.community.spec
*.rpm
install_manifest_libs.txt
install_manifest_platform.txt
install_manifest_storage-engine.txt
_CPack_Packages

52
CMakeLists.txt
View File

@ -48,6 +48,8 @@ SET (INSTALL_ENGINE "/usr/local/mariadb/columnstore")
INCLUDE (configureEngine.cmake)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/releasenum.in ${CMAKE_CURRENT_BINARY_DIR}/build/releasenum @ONLY IMMEDIATE)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/build/releasenum DESTINATION ${INSTALL_ENGINE} COMPONENT platform)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
INCLUDE(bison.cmake)
@ -107,6 +109,20 @@ SET (ENGINE_WRITE_LIBS ddlpackageproc ddlpackage dmlpackageproc dmlpackage
SET (ENGINE_COMMON_LDFLAGS "")
IF (SERVER_BUILD_INCLUDE_DIR)
SET (SERVER_BUILD_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${SERVER_BUILD_INCLUDE_DIR})
ELSE()
SET (SERVER_BUILD_INCLUDE_DIR ${CMAKE_BINARY_DIR}/../include)
ENDIF()
IF (SERVER_SOURCE_ROOT_DIR)
SET (SERVER_SOURCE_ROOT_DIR ${CMAKE_BINARY_DIR}/${SERVER_SOURCE_ROOT_DIR})
ELSE()
SET (SERVER_SOURCE_ROOT_DIR ${CMAKE_BINARY_DIR}/..)
ENDIF()
MESSAGE("SERVER_BUILD_INCLUDE_DIR = ${SERVER_BUILD_INCLUDE_DIR}")
MESSAGE("SERVER_SOURCE_ROOT_DIR = ${SERVER_SOURCE_ROOT_DIR}")
#SET (ENGINE_UTILS_BOOSTIDB_INCLUDE "{CMAKE_CURRENT_SOURCE_DIR}/utils/boost_idb")
SET (ENGINE_UTILS_XML_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/utils/libxml")
@ -145,18 +161,15 @@ SET (ENGINE_UTILS_BATCHLDR_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/utils/batchlo
SET (ENGINE_UTILS_DDLCLEANUP_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/utils/ddlcleanup")
SET (ENGINE_UTILS_QUERYSTATS_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/utils/querystats")
SET (ENGINE_WE_CONFIGCPP_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/writeengine/xml")
SET (ENGINE_SERVER_SQL_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/../../../sql")
SET (ENGINE_SERVER_SQL2_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/../sql")
SET (ENGINE_SERVER_INCLUDE_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/../../../include")
SET (ENGINE_SERVER_INCLUDE_INCLUDE2 "${CMAKE_CURRENT_SOURCE_DIR}/../include")
SET (ENGINE_SERVER_PCRE_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/../../../pcre")
SET (ENGINE_SERVER_PCRE_INCLUDE2 "${CMAKE_CURRENT_SOURCE_DIR}/../pcre")
SET (ENGINE_SERVER_SQL_INCLUDE "${SERVER_SOURCE_ROOT_DIR}/sql")
SET (ENGINE_SERVER_INCLUDE_INCLUDE "${SERVER_SOURCE_ROOT_DIR}/include")
SET (ENGINE_SERVER_PCRE_INCLUDE "${SERVER_SOURCE_ROOT_DIR}/pcre")
SET (ENGINE_NETSNMP_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/net-snmp/net-snmp")
SET (ENGINE_NETSNMP_INCLUDE2 "${CMAKE_CURRENT_SOURCE_DIR}/net-snmp/net-snmp/include")
SET (ENGINE_DEFAULT_INCLUDES "." "../" "../..")
SET (ENGINE_DEFAULT_INCLUDES "." "../" "../../" ${SERVER_BUILD_INCLUDE_DIR})
SET (ENGINE_COMMON_INCLUDES ${ENGINE_DEFAULT_INCLUDES} ${Boost_INCLUDE_DIR} ${ENGINE_UTILS_XML_INCLUDE} ${ENGINE_UTILS_MESSAGEQCPP_INCLUDE} ${ENGINE_WE_SHARED_INCLUDE} ${ENGINE_UTILS_IDBDATAFILE_INCLUDE} ${ENGINE_UTILS_LOGGINGCPP_INCLUDE} ${ENGINE_UTILS_CONFIGCPP_INCLUDE} ${ENGINE_UTILS_COMPRESS_INCLUDE} ${ENGINE_VERSIONING_BRM_INCLUDE} ${ENGINE_UTILS_ROWGROUP_INCLUDE} ${ENGINE_UTILS_COMMON_INCLUDE} ${ENGINE_UTILS_DATACONVERT_INCLUDE} ${ENGINE_UTILS_RWLOCK_INCLUDE} ${ENGINE_UTILS_FUNCEXP_INCLUDE} ${ENGINE_SNMPD_SNMPMANAGER_INCLUDE} ${ENGINE_UTILS_INCLUDE} ${ENGINE_OAM_OAMCPP_INCLUDE} ${ENGINE_DBCON_DDLPKGPROC_INCLUDE} ${ENGINE_DBCON_DDLPKG_INCLUDE} ${ENGINE_DBCON_EXECPLAN_INCLUDE} ${ENGINE_UTILS_STARTUP_INCLUDE} ${ENGINE_DBCON_JOBLIST_INCLUDE} ${ENGINE_WE_WRAPPER_INCLUDE} ${ENGINE_WE_SERVER_INCLUDE} ${ENGINE_DBCON_DMLPKG_INCLUDE} ${ENGINE_WE_CLIENT_INCLUDE} ${ENGINE_DBCON_DMLPKGPROC_INCLUDE} ${ENGINE_UTILS_CACHEUTILS_INCLUDE} ${ENGINE_UTILS_MYSQLCL_INCLUDE} ${ENGINE_UTILS_QUERYTELE_INCLUDE} ${ENGINE_UTILS_THRIFT_INCLUDE} ${ENGINE_UTILS_JOINER_INCLUDE} ${ENGINE_UTILS_THREADPOOL_INCLUDE} ${ENGINE_UTILS_BATCHLDR_INCLUDE} ${ENGINE_UTILS_DDLCLEANUP_INCLUDE} ${ENGINE_UTILS_QUERYSTATS_INCLUDE} ${ENGINE_WE_CONFIGCPP_INCLUDE} ${ENGINE_SERVER_SQL_INCLUDE} ${ENGINE_SERVER_INCLUDE_INCLUDE} ${ENGINE_SERVER_PCRE_INCLUDE} ${ENGINE_SERVER_SQL2_INCLUDE} ${ENGINE_SERVER_INCLUDE_INCLUDE2} ${ENGINE_SERVER_PCRE_INCLUDE2} ${ENGINE_NETSNMP_INCLUDE} ${ENGINE_NETSNMP_INCLUDE2})
SET (ENGINE_COMMON_INCLUDES ${ENGINE_DEFAULT_INCLUDES} ${Boost_INCLUDE_DIR} ${ENGINE_UTILS_XML_INCLUDE} ${ENGINE_UTILS_MESSAGEQCPP_INCLUDE} ${ENGINE_WE_SHARED_INCLUDE} ${ENGINE_UTILS_IDBDATAFILE_INCLUDE} ${ENGINE_UTILS_LOGGINGCPP_INCLUDE} ${ENGINE_UTILS_CONFIGCPP_INCLUDE} ${ENGINE_UTILS_COMPRESS_INCLUDE} ${ENGINE_VERSIONING_BRM_INCLUDE} ${ENGINE_UTILS_ROWGROUP_INCLUDE} ${ENGINE_UTILS_COMMON_INCLUDE} ${ENGINE_UTILS_DATACONVERT_INCLUDE} ${ENGINE_UTILS_RWLOCK_INCLUDE} ${ENGINE_UTILS_FUNCEXP_INCLUDE} ${ENGINE_SNMPD_SNMPMANAGER_INCLUDE} ${ENGINE_UTILS_INCLUDE} ${ENGINE_OAM_OAMCPP_INCLUDE} ${ENGINE_DBCON_DDLPKGPROC_INCLUDE} ${ENGINE_DBCON_DDLPKG_INCLUDE} ${ENGINE_DBCON_EXECPLAN_INCLUDE} ${ENGINE_UTILS_STARTUP_INCLUDE} ${ENGINE_DBCON_JOBLIST_INCLUDE} ${ENGINE_WE_WRAPPER_INCLUDE} ${ENGINE_WE_SERVER_INCLUDE} ${ENGINE_DBCON_DMLPKG_INCLUDE} ${ENGINE_WE_CLIENT_INCLUDE} ${ENGINE_DBCON_DMLPKGPROC_INCLUDE} ${ENGINE_UTILS_CACHEUTILS_INCLUDE} ${ENGINE_UTILS_MYSQLCL_INCLUDE} ${ENGINE_UTILS_QUERYTELE_INCLUDE} ${ENGINE_UTILS_THRIFT_INCLUDE} ${ENGINE_UTILS_JOINER_INCLUDE} ${ENGINE_UTILS_THREADPOOL_INCLUDE} ${ENGINE_UTILS_BATCHLDR_INCLUDE} ${ENGINE_UTILS_DDLCLEANUP_INCLUDE} ${ENGINE_UTILS_QUERYSTATS_INCLUDE} ${ENGINE_WE_CONFIGCPP_INCLUDE} ${ENGINE_SERVER_SQL_INCLUDE} ${ENGINE_SERVER_INCLUDE_INCLUDE} ${ENGINE_SERVER_PCRE_INCLUDE} ${ENGINE_NETSNMP_INCLUDE} ${ENGINE_NETSNMP_INCLUDE2})
INCLUDE (ExternalProject)
@ -199,5 +212,26 @@ ADD_SUBDIRECTORY(writeengine/server)
ADD_SUBDIRECTORY(writeengine/bulk)
ADD_SUBDIRECTORY(writeengine/splitter)
INSTALL(FILES utils/jemalloc/libjemalloc.so.3.3.0 DESTINATION ${ENGINE_LIBDIR})
#This should go away when netsnmp is removed from the builds
INSTALL(PROGRAMS ${ENGINE_LIBDIR}/libnetsnmpagent.so.30.0.3
${ENGINE_LIBDIR}/libnetsnmpagent.so.30
${ENGINE_LIBDIR}/libnetsnmpagent.so
${ENGINE_LIBDIR}/libnetsnmphelpers.so.30.0.3
${ENGINE_LIBDIR}/libnetsnmphelpers.so.30
${ENGINE_LIBDIR}/libnetsnmphelpers.so
${ENGINE_LIBDIR}/libnetsnmpmibs.so.30.0.3
${ENGINE_LIBDIR}/libnetsnmpmibs.so.30
${ENGINE_LIBDIR}/libnetsnmpmibs.so
${ENGINE_LIBDIR}/libnetsnmp.so.30.0.3
${ENGINE_LIBDIR}/libnetsnmp.so.30
${ENGINE_LIBDIR}/libnetsnmp.so
${ENGINE_LIBDIR}/libnetsnmptrapd.so.30.0.3
${ENGINE_LIBDIR}/libnetsnmptrapd.so.30
${ENGINE_LIBDIR}/libnetsnmptrapd.so
DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
INSTALL(PROGRAMS ${ENGINE_SBINDIR}/snmpd ${ENGINE_SBINDIR}/snmptrapd DESTINATION ${ENGINE_SBINDIR} COMPONENT platform)
INSTALL(PROGRAMS utils/jemalloc/libjemalloc.so.3.3.0 DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
INCLUDE(cpackEngineRPM.cmake)

11
build/postInstall_libs.sh Normal file
View File

@ -0,0 +1,11 @@
rpmmode=install
if [ "$1" -eq "$1" 2> /dev/null ]; then
if [ $1 -ne 1 ]; then
rpmmode=upgrade
fi
fi
prefix=/usr/local
echo "MariaDB ColumnStore RPM install completed"

12
build/postInstall_platform.sh Normal file
View File

@ -0,0 +1,12 @@
rpmmode=install
if [ "$1" -eq "$1" 2> /dev/null ]; then
if [ $1 -ne 1 ]; then
rpmmode=upgrade
fi
fi
prefix=/usr/local
test -x /usr/local/mariadb/columnstore/bin/post-install && /usr/local/mariadb/columnstore/bin/post-install --prefix=$prefix --rpmmode=$rpmmode
echo "MariaDB ColumnStore RPM install completed"

12
build/postInstall_storage_engine.sh Normal file
View File

@ -0,0 +1,12 @@
rpmmode=install
if [ "$1" -eq "$1" 2> /dev/null ]; then
if [ $1 -ne 1 ]; then
rpmmode=upgrade
fi
fi
prefix=/usr/local
echo "MariaDB ColumnStore RPM install completed"

11
build/preUn_libs.sh Normal file
View File

@ -0,0 +1,11 @@
rpmmode=upgrade
if [ "$1" -eq "$1" 2> /dev/null ]; then
if [ $1 -ne 1 ]; then
rpmmode=erase
fi
else
rpmmode=erase
fi
exit 0

15
build/preUn_platform.sh Normal file
View File

@ -0,0 +1,15 @@
rpmmode=upgrade
if [ "$1" -eq "$1" 2> /dev/null ]; then
if [ $1 -ne 1 ]; then
rpmmode=erase
fi
else
rpmmode=erase
fi
if [ $rpmmode = erase ]; then
test -x /usr/local/mariadb/columnstore/bin/pre-uninstall && /usr/local/mariadb/columnstore/bin/pre-uninstall
fi
exit 0

11
build/preUn_storage_engine.sh Normal file
View File

@ -0,0 +1,11 @@
rpmmode=upgrade
if [ "$1" -eq "$1" 2> /dev/null ]; then
if [ $1 -ne 1 ]; then
rpmmode=erase
fi
else
rpmmode=erase
fi
exit 0

1
build/releasenum
View File

@ -1,3 +1,2 @@
version=1.0.4
release=1

2
build/releasenum.in Normal file
View File

@ -0,0 +1,2 @@
version=@CPACK_RPM_PACKAGE_VERSION@
release=@CPACK_RPM_PACKAGE_RELEASE@

99
cpackEngineRPM.cmake Normal file
View File

@ -0,0 +1,99 @@
IF(RPM)
SET(CMAKE_INSTALL_PREFIX ${INSTALL_ENGINE})
SET(CPACK_GENERATOR "RPM")
SET(CPACK_RPM_PACKAGE_DEBUG 1)
SET(CPACK_PACKAGING_INSTALL_PREFIX ${INSTALL_ENGINE})
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
SET(CPACK_RPM_COMPONENT_INSTALL ON)
SET(CPACK_COMPONENTS_ALL platform libs storage-engine)
SET(CPACK_PACKAGE_NAME "mariadb-columnstore")
SET(ENGINE_ARCH "x86_64")
IF (NOT CPACK_RPM_PACKAGE_VERSION)
SET (CPACK_RPM_PACKAGE_VERSION "1.0.0")
ENDIF()
IF (NOT CPACK_RPM_PACKAGE_RELEASE)
SET (CPACK_RPM_PACKAGE_RELEASE "0")
ENDIF()
SET(CPACK_RPM_PACKAGE_NAME ${CPACK_PACKAGE_NAME})
SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_VERSION}.${CPACK_RPM_PACKAGE_RELEASE}-${ENGINE_ARCH}-${RPM}")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MariaDB Columnstore: a very fast and robust SQL database server")
SET(CPACK_PACKAGE_URL "http://mariadb.org")
SET(CPACK_PACKAGE_SUMMARY "MariaDB-Columnstore software")
SET(CPACK_PACKAGE_VENDOR "MariaDB Corporation Ab")
SET(CPACK_PACKAGE_LICENSE "Copyright (c) 2016 MariaDB Corporation Ab., all rights reserved; redistributable under the terms of the GPL, see the file COPYING for details.")
SET(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
SET(CPACK_RPM_PACKAGE_RELOCATABLE FALSE)
SET(CPACK_PACKAGE_RELOCATABLE FALSE)
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}
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/).
MariaDB documentation can be found at https://mariadb.com/kb
MariaDB bug reports should be submitted through https://jira.mariadb.org
")
SET(CPACK_RPM_platform_PACKAGE_DESCRIPTION "MariaDB-Columnstore binary files")
SET(CPACK_RPM_platform_PACKAGE_SUMMARY "MariaDB-Columnstore software binaries")
SET(CPACK_RPM_platform_PACKAGE_GROUP "Applications")
SET(CPACK_RPM_libs_PACKAGE_DESCRIPTION "MariaDB-Columnstore libraries")
SET(CPACK_RPM_libs_PACKAGE_SUMMARY "MariaDB-Columnstore software libraries")
SET(CPACK_RPM_storage-engine_PACKAGE_DESCRIPTION "MariaDB Columnstore connector binary files")
SET(CPACK_RPM_storage-engine_PACKAGE_SUMMARY "MariaDB-Columnstore software MariaDB connector")
SET(CPACK_RPM_storage-engine_PACKAGE_GROUP "Applications")
# "set/append array" - append a set of strings, separated by a space
MACRO(SETA var)
FOREACH(v ${ARGN})
SET(${var} "${${var}} ${v}")
ENDFOREACH()
ENDMACRO(SETA)
SETA(CPACK_RPM_libs_PACKAGE_PROVIDES "mariadb-columnstore-libs")
SETA(CPACK_RPM_platform_PACKAGE_PROVIDES "mariadb-columnstore-platform")
SETA(CPACK_RPM_storage-engine_PACKAGE_PROVIDES "mariadb-columnstore-storage-engine")
SETA(CPACK_RPM_libs_PACKAGE_OBSOLETES "mariadb-columnstore-libs")
SETA(CPACK_RPM_platform_PACKAGE_OBSOLETES "mariadb-columnstore-platform")
SETA(CPACK_RPM_storage-engine_PACKAGE_OBSOLETES "mariadb-columnstore-storage-engine")
SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "boost >= 1.53.0" "mariadb-columnstore-libs")
SETA(CPACK_RPM_storage-engine_PACKAGE_REQUIRES "mariadb-columnstore-libs")
SET(CPACK_RPM_platform_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postInstall_platform.sh)
SET(CPACK_RPM_libs_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postInstall_libs.sh)
SET(CPACK_RPM_storage-engine_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postInstall_storage_engine.sh)
SET(CPACK_RPM_platform_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preUn_platform.sh)
SET(CPACK_RPM_libs_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preUn_libs.sh)
SET(CPACK_RPM_storage-engine_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preUn_storage_engine.sh)
#SET(CPACK_RPM_SPEC_MORE_DEFINE "
#%define _prefix ${CMAKE_INSTALL_PREFIX}
#")
INCLUDE (CPack)
ENDIF()

6
dbcon/ddlpackage/CMakeLists.txt
View File

@ -2,7 +2,7 @@
include_directories( ${ENGINE_COMMON_INCLUDES} )
ADD_CUSTOM_COMMAND(
OUTPUT ddl-gram.cpp ddl-scan.cpp
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/ddl-gram.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ddl-scan.cpp
COMMAND ./ddl-gram.sh ${BISON_EXECUTABLE}
COMMAND ./ddl-scan.sh ${LEX_EXECUTABLE}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@ -32,9 +32,9 @@ set(ddlpackage_LIB_SRCS
add_library(ddlpackage SHARED ${ddlpackage_LIB_SRCS})
add_dependencies(ddlpackage ddl-gram.cpp ddl-scan.cpp)
add_dependencies(ddlpackage ${CMAKE_CURRENT_SOURCE_DIR}/ddl-gram.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ddl-scan.cpp)
set_target_properties(ddlpackage PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS ddlpackage DESTINATION ${ENGINE_LIBDIR})
install(TARGETS ddlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
dbcon/ddlpackageproc/CMakeLists.txt
View File

@ -18,5 +18,5 @@ add_dependencies(ddlpackageproc libnetsnmpmibs)
set_target_properties(ddlpackageproc PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS ddlpackageproc DESTINATION ${ENGINE_LIBDIR})
install(TARGETS ddlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

6
dbcon/dmlpackage/CMakeLists.txt
View File

@ -2,7 +2,7 @@
include_directories( ${ENGINE_COMMON_INCLUDES} )
ADD_CUSTOM_COMMAND(
OUTPUT dml-gram.cpp dml-scan.cpp
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/dml-gram.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dml-scan.cpp
COMMAND ./dml-gram.sh ${BISON_EXECUTABLE}
COMMAND ./dml-scan.sh ${LEX_EXECUTABLE}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@ -32,9 +32,9 @@ set(dmlpackage_LIB_SRCS
add_library(dmlpackage SHARED ${dmlpackage_LIB_SRCS})
add_dependencies(dmlpackage dml-gram.cpp dml-scan.cpp)
add_dependencies(dmlpackage ${CMAKE_CURRENT_SOURCE_DIR}/dml-gram.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dml-scan.cpp)
set_target_properties(dmlpackage PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS dmlpackage DESTINATION ${ENGINE_LIBDIR})
install(TARGETS dmlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
dbcon/dmlpackageproc/CMakeLists.txt
View File

@ -19,6 +19,6 @@ add_dependencies(dmlpackageproc libnetsnmpmibs)
set_target_properties(dmlpackageproc PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS dmlpackageproc DESTINATION ${ENGINE_LIBDIR})
install(TARGETS dmlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
dbcon/execplan/CMakeLists.txt
View File

@ -49,5 +49,5 @@ add_dependencies(execplan libnetsnmpmibs)
set_target_properties(execplan PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS execplan DESTINATION ${ENGINE_LIBDIR})
install(TARGETS execplan DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
dbcon/joblist/CMakeLists.txt
View File

@ -65,6 +65,6 @@ add_dependencies(joblist libnetsnmpmibs)
set_target_properties(joblist PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS joblist DESTINATION ${ENGINE_LIBDIR})
install(TARGETS joblist DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

11
dbcon/mysql/CMakeLists.txt
View File

@ -1,9 +1,6 @@
include_directories( ${ENGINE_COMMON_INCLUDES}
/usr/include/libxml2
../../../mysql/include
../../../mysql/sql
../../../mysql/regex )
/usr/include/libxml2 )
SET ( libcalmysql_SRCS
@ -34,16 +31,16 @@ target_link_libraries(calmysql ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} threadpool
set_target_properties(calmysql PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS calmysql DESTINATION ${ENGINE_LIBDIR})
install(TARGETS calmysql DESTINATION ${ENGINE_LIBDIR} COMPONENT storage-engine)
install(FILES syscatalog_mysql.sql
dumpcat_mysql.sql
calsetuserpriority.sql
calremoveuserpriority.sql
calshowprocesslist.sql
my.cnf
DESTINATION ${ENGINE_MYSQLDIR})
DESTINATION ${ENGINE_MYSQLDIR} COMPONENT storage-engine)
install(PROGRAMS install_calpont_mysql.sh mysql-Columnstore dumpcat.pl
DESTINATION ${ENGINE_MYSQLDIR})
DESTINATION ${ENGINE_MYSQLDIR} COMPONENT storage-engine)
#AM_CPPFLAGS = $(idb_common_includes) $(idb_cppflags)

2
ddlproc/CMakeLists.txt
View File

@ -12,5 +12,5 @@ add_dependencies(DDLProc libnetsnmpmibs)
target_link_libraries(DDLProc ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} threadpool)
install(TARGETS DDLProc DESTINATION ${ENGINE_BINDIR})
install(TARGETS DDLProc DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
decomsvr/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(DecomSvr ${DecomSvr_SRCS})
target_link_libraries(DecomSvr ${ENGINE_LDFLAGS} ${Boost_LIBRARIES} pthread rt)
install(TARGETS DecomSvr DESTINATION ${ENGINE_BINDIR})
install(TARGETS DecomSvr DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
dmlproc/CMakeLists.txt
View File

@ -16,7 +16,7 @@ add_dependencies(DMLProc libnetsnmpmibs)
target_link_libraries(DMLProc ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} threadpool ddlcleanuputil batchloader)
install(TARGETS DMLProc DESTINATION ${ENGINE_BINDIR})
install(TARGETS DMLProc DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
exemgr/CMakeLists.txt
View File

@ -12,7 +12,7 @@ add_dependencies(ExeMgr libnetsnmpmibs)
target_link_libraries(ExeMgr ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} cacheutils threadpool)
install(TARGETS ExeMgr DESTINATION ${ENGINE_BINDIR})
install(TARGETS ExeMgr DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
########### install files ###############

2
oam/cloud/CMakeLists.txt
View File

@ -1,2 +1,2 @@
install(PROGRAMS IDBInstanceCmds.sh IDBVolumeCmds.sh DESTINATION ${ENGINE_BINDIR})
install(PROGRAMS IDBInstanceCmds.sh IDBVolumeCmds.sh DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
oam/etc/CMakeLists.txt
View File

@ -5,4 +5,4 @@ install(FILES AlarmConfig.xml
ConsoleCmds.xml
Columnstore.xml.singleserver
ProcessConfig.xml.singleserver
DESTINATION ${ENGINE_ETCDIR})
DESTINATION ${ENGINE_ETCDIR} COMPONENT platform)

5
oam/install_scripts/CMakeLists.txt
View File

@ -22,7 +22,6 @@ install(PROGRAMS post-install
columnstoreSyslog-ng
syslogSetup.sh
remote_scp_put.sh
columnstoreUninstall.sh
columnstore.def
remotessh.exp
rsync.sh
@ -35,7 +34,7 @@ install(PROGRAMS post-install
myCnf-include-args.text
myCnf-exclude-args.text
columnstore.service
DESTINATION ${ENGINE_BINDIR})
DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(FILES module DESTINATION ${ENGINE_LOCALDIR})
install(FILES module DESTINATION ${ENGINE_LOCALDIR} COMPONENT platform)

2
oam/oamcpp/CMakeLists.txt
View File

@ -12,6 +12,6 @@ add_dependencies(oamcpp libnetsnmpmibs)
set_target_properties(oamcpp PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS oamcpp DESTINATION ${ENGINE_LIBDIR})
install(TARGETS oamcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
oam/post/CMakeLists.txt
View File

@ -1,3 +1,3 @@
install(PROGRAMS functions test-001.sh test-002.sh test-003.sh test-004.sh DESTINATION ${ENGINE_POSTDIR})
install(PROGRAMS functions test-001.sh test-002.sh test-003.sh test-004.sh DESTINATION ${ENGINE_POSTDIR} COMPONENT platform)

2
oamapps/columnstoreDB/CMakeLists.txt
View File

@ -12,5 +12,5 @@ add_dependencies(columnstoreDBWrite libnetsnmpmibs)
target_link_libraries(columnstoreDBWrite ${ENGINE_LDFLAGS} readline ncurses ${ENGINE_EXEC_LIBS})
install(TARGETS columnstoreDBWrite DESTINATION ${ENGINE_BINDIR})
install(TARGETS columnstoreDBWrite DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

4
oamapps/columnstoreSupport/CMakeLists.txt
View File

@ -12,9 +12,9 @@ add_dependencies(columnstoreSupport libnetsnmpmibs)
target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} readline ncurses ${ENGINE_EXEC_LIBS})
install(TARGETS columnstoreSupport DESTINATION ${ENGINE_BINDIR})
install(TARGETS columnstoreSupport DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(PROGRAMS alarmReport.sh bulklogReport.sh configReport.sh hadoopReport.sh
hardwareReport.sh logReport.sh resourceReport.sh softwareReport.sh
DESTINATION ${ENGINE_BINDIR})
DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
oamapps/mcsadmin/CMakeLists.txt
View File

@ -12,5 +12,5 @@ add_dependencies(mcsadmin libnetsnmpmibs)
target_link_libraries(mcsadmin ${ENGINE_LDFLAGS} readline ncurses ${ENGINE_EXEC_LIBS})
install(TARGETS mcsadmin DESTINATION ${ENGINE_BINDIR})
install(TARGETS mcsadmin DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

10
oamapps/postConfigure/CMakeLists.txt
View File

@ -12,7 +12,7 @@ add_dependencies(postConfigure libnetsnmpmibs)
target_link_libraries(postConfigure ${ENGINE_LDFLAGS} readline ncurses ${ENGINE_EXEC_LIBS})
install(TARGETS postConfigure DESTINATION ${ENGINE_BINDIR})
install(TARGETS postConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
########### next target ###############
@ -25,7 +25,7 @@ add_dependencies(installer libnetsnmpmibs)
target_link_libraries(installer ${ENGINE_LDFLAGS} readline ncurses ${ENGINE_EXEC_LIBS})
install(TARGETS installer DESTINATION ${ENGINE_BINDIR})
install(TARGETS installer DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
########### next target ###############
@ -38,7 +38,7 @@ add_dependencies(getMySQLpw libnetsnmpmibs)
target_link_libraries(getMySQLpw ${ENGINE_LDFLAGS} readline ncurses ${ENGINE_EXEC_LIBS})
install(TARGETS getMySQLpw DESTINATION ${ENGINE_BINDIR})
install(TARGETS getMySQLpw DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
########### next target ###############
@ -51,7 +51,7 @@ add_dependencies(amazonInstaller libnetsnmpmibs)
target_link_libraries(amazonInstaller ${ENGINE_LDFLAGS} readline ncurses ${ENGINE_EXEC_LIBS})
install(TARGETS amazonInstaller DESTINATION ${ENGINE_BINDIR})
install(TARGETS amazonInstaller DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
########### next target ###############
@ -64,5 +64,5 @@ add_dependencies(mycnfUpgrade libnetsnmpmibs)
target_link_libraries(mycnfUpgrade ${ENGINE_LDFLAGS} readline ncurses ${ENGINE_EXEC_LIBS})
install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR})
install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
oamapps/sendtrap/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(sendtrap ${sendtrap_SRCS})
target_link_libraries(sendtrap ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS})
install(TARGETS sendtrap DESTINATION ${ENGINE_BINDIR})
install(TARGETS sendtrap DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
oamapps/serverMonitor/CMakeLists.txt
View File

@ -19,5 +19,5 @@ add_executable(ServerMonitor ${ServerMonitor_SRCS})
target_link_libraries(ServerMonitor ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS})
install(TARGETS ServerMonitor DESTINATION ${ENGINE_BINDIR})
install(TARGETS ServerMonitor DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
oamapps/traphandler/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(trapHandler ${trapHandler_SRCS})
target_link_libraries(trapHandler ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS})
install(TARGETS trapHandler DESTINATION ${ENGINE_BINDIR})
install(TARGETS trapHandler DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
primitives/primproc/CMakeLists.txt
View File

@ -28,6 +28,6 @@ add_dependencies(PrimProc libnetsnmpmibs)
target_link_libraries(PrimProc ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} threadpool cacheutils dbbc processor)
install(TARGETS PrimProc DESTINATION ${ENGINE_BINDIR})
install(TARGETS PrimProc DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
procmgr/CMakeLists.txt
View File

@ -12,5 +12,5 @@ add_dependencies(ProcMgr libnetsnmpmibs)
target_link_libraries(ProcMgr ${ENGINE_LDFLAGS} cacheutils ${ENGINE_EXEC_LIBS})
install(TARGETS ProcMgr DESTINATION ${ENGINE_BINDIR})
install(TARGETS ProcMgr DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
procmon/CMakeLists.txt
View File

@ -12,5 +12,5 @@ add_dependencies(ProcMon libnetsnmpmibs)
target_link_libraries(ProcMon ${ENGINE_LDFLAGS} cacheutils ${ENGINE_EXEC_LIBS})
install(TARGETS ProcMon DESTINATION ${ENGINE_BINDIR})
install(TARGETS ProcMon DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

6
snmpd/etc/CMakeLists.txt
View File

@ -5,7 +5,7 @@ install(FILES snmpd.conf
snmptrapd.conf
snmpd.conf.singleserver
snmptrapd.conf.singleserver
DESTINATION ${ENGINE_ETCDIR})
DESTINATION ${ENGINE_ETCDIR} COMPONENT platform)
install(FILES CALPONT-MIB.txt
AGENTX-MIB.txt
@ -63,6 +63,6 @@ install(FILES CALPONT-MIB.txt
UCD-DLMOD-MIB.txt
UCD-IPFWACC-MIB.txt
UCD-SNMP-MIB.txt
UDP-MIB.txt DESTINATION ${ENGINE_MIBDIR} )
UDP-MIB.txt DESTINATION ${ENGINE_MIBDIR} COMPONENT platform )
install(FILES snmpdx.conf snmpdx.conf.singleserver DESTINATION ${ENGINE_LOCALDIR})
install(FILES snmpdx.conf snmpdx.conf.singleserver DESTINATION ${ENGINE_LOCALDIR} COMPONENT platform)

2
snmpd/snmpmanager/CMakeLists.txt
View File

@ -12,6 +12,6 @@ add_dependencies(snmpmanager libnetsnmpmibs)
set_target_properties(snmpmanager PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS snmpmanager DESTINATION ${ENGINE_LIBDIR})
install(TARGETS snmpmanager DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
tools/clearShm/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(clearShm ${clearShm_SRCS})
target_link_libraries(clearShm ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS})
install(TARGETS clearShm DESTINATION ${ENGINE_BINDIR})
install(TARGETS clearShm DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
tools/cleartablelock/CMakeLists.txt
View File

@ -12,5 +12,5 @@ add_dependencies(cleartablelock libnetsnmpmibs)
target_link_libraries(cleartablelock ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS})
install(TARGETS cleartablelock DESTINATION ${ENGINE_BINDIR})
install(TARGETS cleartablelock DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
tools/configMgt/CMakeLists.txt
View File

@ -25,7 +25,7 @@ add_dependencies(autoConfigure libnetsnmpmibs)
target_link_libraries(autoConfigure ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS})
install(TARGETS autoConfigure DESTINATION ${ENGINE_BINDIR})
install(TARGETS autoConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
########### next target ###############

2
tools/cplogger/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(cplogger ${cplogger_SRCS})
target_link_libraries(cplogger ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS})
install(TARGETS cplogger DESTINATION ${ENGINE_BINDIR})
install(TARGETS cplogger DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
tools/dbbuilder/CMakeLists.txt
View File

@ -12,5 +12,5 @@ add_dependencies(dbbuilder libnetsnmpmibs)
target_link_libraries(dbbuilder ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS})
install(TARGETS dbbuilder DESTINATION ${ENGINE_BINDIR})
install(TARGETS dbbuilder DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
tools/dbloadxml/CMakeLists.txt
View File

@ -15,5 +15,5 @@ add_executable(colxml ${colxml_SRCS})
target_link_libraries(colxml ${ENGINE_LDFLAGS} dbload ${ENGINE_WRITE_LIBS})
install(TARGETS colxml DESTINATION ${ENGINE_BINDIR})
install(TARGETS colxml DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
tools/ddlcleanup/CMakeLists.txt
View File

@ -12,5 +12,5 @@ add_dependencies(ddlcleanup libnetsnmpmibs)
target_link_libraries(ddlcleanup ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ddlcleanuputil)
install(TARGETS ddlcleanup DESTINATION ${ENGINE_BINDIR})
install(TARGETS ddlcleanup DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
tools/editem/CMakeLists.txt
View File

@ -12,5 +12,5 @@ add_dependencies(editem libnetsnmpmibs)
target_link_libraries(editem ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS})
install(TARGETS editem DESTINATION ${ENGINE_BINDIR})
install(TARGETS editem DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
tools/getConfig/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(getConfig ${getConfig_SRCS})
target_link_libraries(getConfig ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS})
install(TARGETS getConfig DESTINATION ${ENGINE_BINDIR})
install(TARGETS getConfig DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
tools/idbmeminfo/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(idbmeminfo ${idbmeminfo_SRCS})
target_link_libraries(idbmeminfo ${ENGINE_LDFLAGS})
install(TARGETS idbmeminfo DESTINATION ${ENGINE_BINDIR})
install(TARGETS idbmeminfo DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

4
tools/setConfig/CMakeLists.txt
View File

@ -12,7 +12,7 @@ add_dependencies(setConfig libnetsnmpmibs)
target_link_libraries(setConfig ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS})
install(TARGETS setConfig DESTINATION ${ENGINE_BINDIR})
install(TARGETS setConfig DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(PROGRAMS configxml.sh DESTINATION ${ENGINE_BINDIR})
install(PROGRAMS configxml.sh DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
tools/viewtablelock/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(viewtablelock ${viewtablelock_SRCS})
target_link_libraries(viewtablelock ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS})
install(TARGETS viewtablelock DESTINATION ${ENGINE_BINDIR})
install(TARGETS viewtablelock DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
utils/batchloader/CMakeLists.txt
View File

@ -12,6 +12,6 @@ add_dependencies(batchloader libnetsnmpmibs)
set_target_properties(batchloader PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS batchloader DESTINATION ${ENGINE_LIBDIR})
install(TARGETS batchloader DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
utils/boost_idb/CMakeLists.txt
View File

@ -37,5 +37,5 @@ add_library(boost_idb SHARED ${boost_idb_LIB_SRCS})
set_target_properties(boost_idb PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS boost_idb DESTINATION ${ENGINE_LIBDIR})
install(TARGETS boost_idb DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
utils/cacheutils/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_library(cacheutils SHARED ${cacheutils_LIB_SRCS})
set_target_properties(cacheutils PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS cacheutils DESTINATION ${ENGINE_LIBDIR})
install(TARGETS cacheutils DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
utils/common/CMakeLists.txt
View File

@ -17,5 +17,5 @@ add_dependencies(common loggingcpp)
set_target_properties(common PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS common DESTINATION ${ENGINE_LIBDIR})
install(TARGETS common DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
utils/compress/CMakeLists.txt
View File

@ -16,5 +16,5 @@ add_library(compress SHARED ${compress_LIB_SRCS})
set_target_properties(compress PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS compress DESTINATION ${ENGINE_LIBDIR})
install(TARGETS compress DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
utils/configcpp/CMakeLists.txt
View File

@ -9,5 +9,5 @@ add_library(configcpp SHARED ${configcpp_LIB_SRCS})
set_target_properties(configcpp PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS configcpp DESTINATION ${ENGINE_LIBDIR})
install(TARGETS configcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
utils/dataconvert/CMakeLists.txt
View File

@ -10,4 +10,4 @@ add_library(dataconvert SHARED ${dataconvert_LIB_SRCS})
set_target_properties(dataconvert PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS dataconvert DESTINATION ${ENGINE_LIBDIR})
install(TARGETS dataconvert DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
utils/ddlcleanup/CMakeLists.txt
View File

@ -12,5 +12,5 @@ add_dependencies(ddlcleanuputil libnetsnmpmibs)
set_target_properties(ddlcleanuputil PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS ddlcleanuputil DESTINATION ${ENGINE_LIBDIR})
install(TARGETS ddlcleanuputil DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
utils/funcexp/CMakeLists.txt
View File

@ -112,6 +112,6 @@ add_dependencies(funcexp libnetsnmpmibs)
set_target_properties(funcexp PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS funcexp DESTINATION ${ENGINE_LIBDIR})
install(TARGETS funcexp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
utils/idbdatafile/CMakeLists.txt
View File

@ -20,4 +20,4 @@ add_dependencies(idbdatafile libnetsnmpmibs)
set_target_properties(idbdatafile PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS idbdatafile DESTINATION ${ENGINE_LIBDIR})
install(TARGETS idbdatafile DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
utils/idbhdfs/hdfs-12/CMakeLists.txt
View File

@ -18,5 +18,5 @@ set_target_properties(hdfs-12 PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS hdfs-12 DESTINATION ${ENGINE_LIBDIR})
install(PROGRAMS setenv-hdfs-12 DESTINATION ${ENGINE_BINDIR})
install(PROGRAMS setenv-hdfs-12 DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
utils/idbhdfs/hdfs-20/CMakeLists.txt
View File

@ -20,5 +20,5 @@ set_target_properties(hdfs-20 PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS hdfs-20 DESTINATION ${ENGINE_LIBDIR})
install(PROGRAMS setenv-hdfs-20 DESTINATION ${ENGINE_BINDIR})
install(PROGRAMS setenv-hdfs-20 DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
utils/joiner/CMakeLists.txt
View File

@ -10,6 +10,6 @@ add_library(joiner SHARED ${joiner_LIB_SRCS})
set_target_properties(joiner PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS joiner DESTINATION ${ENGINE_LIBDIR})
install(TARGETS joiner DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

8
utils/loggingcpp/CMakeLists.txt
View File

@ -14,13 +14,13 @@ set(loggingcpp_LIB_SRCS
idberrorinfo.cpp)
ADD_CUSTOM_COMMAND(
OUTPUT messageids.h errorids.h
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/messageids.h ${CMAKE_CURRENT_SOURCE_DIR}/errorids.h
COMMAND ./genMsgAndErrId.sh
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS genMsgId.pl genErrId.pl
)
ADD_CUSTOM_TARGET(genMsgAndErrId DEPENDS messageids.h errorids.h)
ADD_CUSTOM_TARGET(genMsgAndErrId DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/messageids.h ${CMAKE_CURRENT_SOURCE_DIR}/errorids.h)
add_library(loggingcpp SHARED ${loggingcpp_LIB_SRCS})
@ -28,7 +28,7 @@ add_dependencies(loggingcpp genMsgAndErrId)
set_target_properties(loggingcpp PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS loggingcpp DESTINATION ${ENGINE_LIBDIR})
install(TARGETS loggingcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
install(FILES MessageFile.txt ErrorMessage.txt DESTINATION ${ENGINE_ETCDIR})
install(FILES MessageFile.txt ErrorMessage.txt DESTINATION ${ENGINE_ETCDIR} COMPONENT platform)

2
utils/messageqcpp/CMakeLists.txt
View File

@ -15,4 +15,4 @@ add_library(messageqcpp SHARED ${messageqcpp_LIB_SRCS})
set_target_properties(messageqcpp PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS messageqcpp DESTINATION ${ENGINE_LIBDIR})
install(TARGETS messageqcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
utils/mysqlcl_idb/CMakeLists.txt
View File

@ -23,5 +23,5 @@ add_library(mysqlcl_idb SHARED ${mysqlcl_idb_LIB_SRCS})
set_target_properties(mysqlcl_idb PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS mysqlcl_idb DESTINATION ${ENGINE_LIBDIR})
install(TARGETS mysqlcl_idb DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
utils/querystats/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_library(querystats SHARED ${querystats_LIB_SRCS})
set_target_properties(querystats PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS querystats DESTINATION ${ENGINE_LIBDIR})
install(TARGETS querystats DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
utils/querytele/CMakeLists.txt
View File

@ -16,5 +16,5 @@ add_library(querytele SHARED ${querytele_LIB_SRCS})
set_target_properties(querytele PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS querytele DESTINATION ${ENGINE_LIBDIR})
install(TARGETS querytele DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
utils/rowgroup/CMakeLists.txt
View File

@ -14,5 +14,5 @@ add_dependencies(rowgroup libnetsnmpmibs)
set_target_properties(rowgroup PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS rowgroup DESTINATION ${ENGINE_LIBDIR})
install(TARGETS rowgroup DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
utils/rwlock/CMakeLists.txt
View File

@ -11,5 +11,5 @@ add_library(rwlock SHARED ${rwlock_LIB_SRCS})
set_target_properties(rwlock PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS rwlock DESTINATION ${ENGINE_LIBDIR})
install(TARGETS rwlock DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
utils/threadpool/CMakeLists.txt
View File

@ -10,4 +10,4 @@ add_library(threadpool SHARED ${threadpool_LIB_SRCS})
set_target_properties(threadpool PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS threadpool DESTINATION ${ENGINE_LIBDIR})
install(TARGETS threadpool DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
utils/thrift/CMakeLists.txt
View File

@ -18,5 +18,5 @@ add_library(thrift SHARED ${thrift_LIB_SRCS})
set_target_properties(thrift PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS thrift DESTINATION ${ENGINE_LIBDIR})
install(TARGETS thrift DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

16
utils/udfsdk/CMakeLists.txt
View File

@ -1,9 +1,7 @@
include_directories( ${ENGINE_COMMON_INCLUDES}
../../dbcon/mysql
../../mysql/include
../../mysql/sql
../../mysql/regex )
../../dbcon/mysql )
########### next target ###############
set(udfsdk_LIB_SRCS udfinfinidb.cpp)
@ -16,3 +14,13 @@ set_target_properties(udfsdk PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS udfsdk DESTINATION ${ENGINE_LIBDIR})
set(udf_mysql_LIB_SRCS udfmysql.cpp)
add_library(udf_mysql SHARED ${udf_mysql_LIB_SRCS})
set_target_properties(udf_mysql PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS udf_mysql DESTINATION ${ENGINE_LIBDIR})

2
utils/windowfunction/CMakeLists.txt
View File

@ -27,5 +27,5 @@ add_library(windowfunction SHARED ${windowfunction_LIB_SRCS})
set_target_properties(windowfunction PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS windowfunction DESTINATION ${ENGINE_LIBDIR})
install(TARGETS windowfunction DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

16
versioning/BRM/CMakeLists.txt
View File

@ -36,7 +36,7 @@ set_target_properties(brm PROPERTIES VERSION 1.0.0 SOVERSION 1)
add_dependencies(brm libnetsnmpmibs)
install(TARGETS brm DESTINATION ${ENGINE_LIBDIR})
install(TARGETS brm DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
########### next target ###############
@ -49,7 +49,7 @@ add_dependencies(controllernode libnetsnmpmibs)
target_link_libraries(controllernode ${ENGINE_LDFLAGS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${ENGINE_NETSNMP_LIBS})
install(TARGETS controllernode DESTINATION ${ENGINE_BINDIR})
install(TARGETS controllernode DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
########### next target ###############
@ -62,7 +62,7 @@ add_dependencies(workernode libnetsnmpmibs)
target_link_libraries(workernode ${ENGINE_LDFLAGS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${ENGINE_NETSNMP_LIBS})
install(TARGETS workernode DESTINATION ${ENGINE_BINDIR})
install(TARGETS workernode DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
########### next target ###############
@ -73,7 +73,7 @@ add_executable(dbrmctl ${dbrmctl_SRCS})
target_link_libraries(dbrmctl ${ENGINE_LDFLAGS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${ENGINE_NETSNMP_LIBS})
install(TARGETS dbrmctl DESTINATION ${ENGINE_BINDIR})
install(TARGETS dbrmctl DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
########### next target ###############
@ -84,7 +84,7 @@ add_executable(reset_locks ${reset_locks_SRCS})
target_link_libraries(reset_locks ${ENGINE_LDFLAGS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${ENGINE_NETSNMP_LIBS})
install(TARGETS reset_locks DESTINATION ${ENGINE_BINDIR})
install(TARGETS reset_locks DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
########### next target ###############
@ -95,7 +95,7 @@ add_executable(rollback ${rollback_SRCS})
target_link_libraries(rollback ${ENGINE_LDFLAGS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${ENGINE_NETSNMP_LIBS})
install(TARGETS rollback DESTINATION ${ENGINE_BINDIR})
install(TARGETS rollback DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
########### next target ###############
@ -106,7 +106,7 @@ add_executable(save_brm ${save_brm_SRCS})
target_link_libraries(save_brm ${ENGINE_LDFLAGS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${ENGINE_NETSNMP_LIBS})
install(TARGETS save_brm DESTINATION ${ENGINE_BINDIR})
install(TARGETS save_brm DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
########### next target ###############
@ -117,5 +117,5 @@ add_executable(load_brm ${load_brm_SRCS})
target_link_libraries(load_brm ${ENGINE_LDFLAGS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${ENGINE_NETSNMP_LIBS})
install(TARGETS load_brm DESTINATION ${ENGINE_BINDIR})
install(TARGETS load_brm DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
writeengine/bulk/CMakeLists.txt
View File

@ -40,5 +40,5 @@ add_dependencies(cpimport.bin libnetsnmpmibs)
target_link_libraries(cpimport.bin ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} we_bulk we_xml)
install(TARGETS cpimport.bin DESTINATION ${ENGINE_BINDIR})
install(TARGETS cpimport.bin DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
writeengine/client/CMakeLists.txt
View File

@ -12,6 +12,6 @@ add_dependencies(writeengineclient libnetsnmpmibs)
set_target_properties(writeengineclient PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS writeengineclient DESTINATION ${ENGINE_LIBDIR})
install(TARGETS writeengineclient DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
writeengine/redistribute/CMakeLists.txt
View File

@ -15,5 +15,5 @@ add_dependencies(writeengineredistribute libnetsnmpmibs)
set_target_properties(writeengineredistribute PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS writeengineredistribute DESTINATION ${ENGINE_LIBDIR})
install(TARGETS writeengineredistribute DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
writeengine/server/CMakeLists.txt
View File

@ -22,5 +22,5 @@ add_dependencies(WriteEngineServer libnetsnmpmibs)
target_link_libraries(WriteEngineServer ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} threadpool writeengineredistribute)
install(TARGETS WriteEngineServer DESTINATION ${ENGINE_BINDIR})
install(TARGETS WriteEngineServer DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
writeengine/splitter/CMakeLists.txt
View File

@ -21,5 +21,5 @@ add_dependencies(cpimport libnetsnmpmibs)
target_link_libraries(cpimport ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} batchloader threadpool)
install(TARGETS cpimport DESTINATION ${ENGINE_BINDIR})
install(TARGETS cpimport DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
writeengine/wrapper/CMakeLists.txt
View File

@ -43,5 +43,5 @@ add_dependencies(writeengine libnetsnmpmibs)
set_target_properties(writeengine PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS writeengine DESTINATION ${ENGINE_LIBDIR})
install(TARGETS writeengine DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)