From 1c74f80d768260215ff3c4664e37ba81e293925e Mon Sep 17 00:00:00 2001 From: Roman Nozdrin Date: Wed, 5 Aug 2020 12:18:40 +0000 Subject: [PATCH] MCOL-4136 This patch makes an explicit dependency on generated errorids.h --- dbcon/ddlpackage/CMakeLists.txt | 2 ++ dbcon/ddlpackageproc/CMakeLists.txt | 2 ++ dbcon/dmlpackage/CMakeLists.txt | 1 + oam/oamcpp/CMakeLists.txt | 2 ++ oamapps/alarmmanager/CMakeLists.txt | 2 ++ primitives/linux-port/CMakeLists.txt | 2 ++ tools/dbloadxml/CMakeLists.txt | 2 ++ utils/batchloader/CMakeLists.txt | 2 ++ utils/cacheutils/CMakeLists.txt | 2 ++ utils/dataconvert/CMakeLists.txt | 2 ++ utils/ddlcleanup/CMakeLists.txt | 2 ++ utils/joiner/CMakeLists.txt | 2 ++ utils/messageqcpp/CMakeLists.txt | 2 ++ utils/regr/CMakeLists.txt | 2 ++ utils/threadpool/CMakeLists.txt | 2 ++ utils/udfsdk/CMakeLists.txt | 2 ++ writeengine/bulk/CMakeLists.txt | 2 ++ writeengine/redistribute/CMakeLists.txt | 2 ++ writeengine/wrapper/CMakeLists.txt | 2 ++ writeengine/xml/CMakeLists.txt | 2 ++ 20 files changed, 39 insertions(+) diff --git a/dbcon/ddlpackage/CMakeLists.txt b/dbcon/ddlpackage/CMakeLists.txt index 7de884262..ed2114030 100644 --- a/dbcon/ddlpackage/CMakeLists.txt +++ b/dbcon/ddlpackage/CMakeLists.txt @@ -36,5 +36,7 @@ ADD_LIBRARY(ddlpackage SHARED ${FLEX_ddl_scan_OUTPUTS} ) +add_dependencies(ddlpackage loggingcpp) + INSTALL(TARGETS ddlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) diff --git a/dbcon/ddlpackageproc/CMakeLists.txt b/dbcon/ddlpackageproc/CMakeLists.txt index ff0d6dda0..d2f2a9a62 100644 --- a/dbcon/ddlpackageproc/CMakeLists.txt +++ b/dbcon/ddlpackageproc/CMakeLists.txt @@ -14,6 +14,8 @@ set(ddlpackageproc_LIB_SRCS add_library(ddlpackageproc SHARED ${ddlpackageproc_LIB_SRCS}) +add_dependencies(ddlpackageproc loggingcpp) + target_link_libraries(ddlpackageproc ${NETSNMP_LIBRARIES}) install(TARGETS ddlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) diff --git a/dbcon/dmlpackage/CMakeLists.txt b/dbcon/dmlpackage/CMakeLists.txt index 965974318..d7b5f235a 100644 --- a/dbcon/dmlpackage/CMakeLists.txt +++ b/dbcon/dmlpackage/CMakeLists.txt @@ -37,6 +37,7 @@ ADD_LIBRARY(dmlpackage SHARED ${FLEX_dml_scan_OUTPUTS} ) +add_dependencies(dmlpackage loggingcpp) INSTALL(TARGETS dmlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) diff --git a/oam/oamcpp/CMakeLists.txt b/oam/oamcpp/CMakeLists.txt index c6550d1f1..6c71af12e 100644 --- a/oam/oamcpp/CMakeLists.txt +++ b/oam/oamcpp/CMakeLists.txt @@ -8,6 +8,8 @@ set(oamcpp_LIB_SRCS liboamcpp.cpp oamcache.cpp) add_library(oamcpp SHARED ${oamcpp_LIB_SRCS}) +add_dependencies(oamcpp loggingcpp) + target_link_libraries(oamcpp ) target_compile_options(oamcpp PRIVATE -Wno-unused-result) diff --git a/oamapps/alarmmanager/CMakeLists.txt b/oamapps/alarmmanager/CMakeLists.txt index 227740ff1..e1696d5e4 100644 --- a/oamapps/alarmmanager/CMakeLists.txt +++ b/oamapps/alarmmanager/CMakeLists.txt @@ -8,6 +8,8 @@ set(alarmmanager_LIB_SRCS alarmmanager.cpp alarm.cpp) add_library(alarmmanager SHARED ${alarmmanager_LIB_SRCS}) +add_dependencies(alarmmanager loggingcpp) + target_compile_options(alarmmanager PRIVATE -Wno-unused-result) install(TARGETS alarmmanager DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) diff --git a/primitives/linux-port/CMakeLists.txt b/primitives/linux-port/CMakeLists.txt index 92fd09da1..08ca261f8 100644 --- a/primitives/linux-port/CMakeLists.txt +++ b/primitives/linux-port/CMakeLists.txt @@ -10,6 +10,8 @@ set(processor_STAT_SRCS primitiveprocessor.cpp dictionary.cpp column.cpp) add_library(processor STATIC ${processor_STAT_SRCS}) +add_dependencies(processor loggingcpp) + target_link_libraries(processor ${NETSNMP_LIBRARIES}) INSTALL (TARGETS processor DESTINATION ${ENGINE_LIBDIR}) diff --git a/tools/dbloadxml/CMakeLists.txt b/tools/dbloadxml/CMakeLists.txt index aa9d09e65..d7bc50fa8 100644 --- a/tools/dbloadxml/CMakeLists.txt +++ b/tools/dbloadxml/CMakeLists.txt @@ -7,6 +7,8 @@ set(dbload_STAT_SRCS inputmgr.cpp) add_library(dbload STATIC ${dbload_STAT_SRCS}) +add_dependencies(dbload loggingcpp) + ########### next target ############### set(colxml_SRCS colxml.cpp) diff --git a/utils/batchloader/CMakeLists.txt b/utils/batchloader/CMakeLists.txt index 66e2d0bcd..6efc15fba 100644 --- a/utils/batchloader/CMakeLists.txt +++ b/utils/batchloader/CMakeLists.txt @@ -8,6 +8,8 @@ set(batchloader_LIB_SRCS batchloader.cpp) add_library(batchloader SHARED ${batchloader_LIB_SRCS}) +add_dependencies(batchloader loggingcpp) + target_link_libraries(batchloader ${NETSNMP_LIBRARIES}) install(TARGETS batchloader DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) diff --git a/utils/cacheutils/CMakeLists.txt b/utils/cacheutils/CMakeLists.txt index 02481aabd..2f6b5fe50 100644 --- a/utils/cacheutils/CMakeLists.txt +++ b/utils/cacheutils/CMakeLists.txt @@ -8,5 +8,7 @@ set(cacheutils_LIB_SRCS cacheutils.cpp) add_library(cacheutils SHARED ${cacheutils_LIB_SRCS}) +add_dependencies(cacheutils loggingcpp) + install(TARGETS cacheutils DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) diff --git a/utils/dataconvert/CMakeLists.txt b/utils/dataconvert/CMakeLists.txt index c22def65b..3e37b3c0e 100644 --- a/utils/dataconvert/CMakeLists.txt +++ b/utils/dataconvert/CMakeLists.txt @@ -8,4 +8,6 @@ set(dataconvert_LIB_SRCS dataconvert.cpp) add_library(dataconvert SHARED ${dataconvert_LIB_SRCS}) +add_dependencies(dataconvert loggingcpp) + install(TARGETS dataconvert DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) diff --git a/utils/ddlcleanup/CMakeLists.txt b/utils/ddlcleanup/CMakeLists.txt index ab6e31e22..4ac17b51c 100644 --- a/utils/ddlcleanup/CMakeLists.txt +++ b/utils/ddlcleanup/CMakeLists.txt @@ -8,6 +8,8 @@ set(ddlcleanuputil_LIB_SRCS ddlcleanuputil.cpp) add_library(ddlcleanuputil SHARED ${ddlcleanuputil_LIB_SRCS}) +add_dependencies(ddlcleanuputil loggingcpp) + target_link_libraries(ddlcleanuputil ${NETSNMP_LIBRARIES}) install(TARGETS ddlcleanuputil DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) diff --git a/utils/joiner/CMakeLists.txt b/utils/joiner/CMakeLists.txt index a881402bf..66c2b5146 100644 --- a/utils/joiner/CMakeLists.txt +++ b/utils/joiner/CMakeLists.txt @@ -8,6 +8,8 @@ set(joiner_LIB_SRCS tuplejoiner.cpp joinpartition.cpp) add_library(joiner SHARED ${joiner_LIB_SRCS}) +add_dependencies(joiner loggingcpp) + install(TARGETS joiner DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) diff --git a/utils/messageqcpp/CMakeLists.txt b/utils/messageqcpp/CMakeLists.txt index aa4b0e4f1..fcc2577de 100644 --- a/utils/messageqcpp/CMakeLists.txt +++ b/utils/messageqcpp/CMakeLists.txt @@ -16,4 +16,6 @@ set(messageqcpp_LIB_SRCS add_library(messageqcpp SHARED ${messageqcpp_LIB_SRCS}) +add_dependencies(messageqcpp loggingcpp) + install(TARGETS messageqcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) diff --git a/utils/regr/CMakeLists.txt b/utils/regr/CMakeLists.txt index 32d29b3f2..618e190a0 100755 --- a/utils/regr/CMakeLists.txt +++ b/utils/regr/CMakeLists.txt @@ -10,6 +10,8 @@ add_definitions(-DMYSQL_DYNAMIC_PLUGIN) add_library(regr SHARED ${regr_LIB_SRCS} ) +add_dependencies(regr loggingcpp) + install(TARGETS regr DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) diff --git a/utils/threadpool/CMakeLists.txt b/utils/threadpool/CMakeLists.txt index bc1a5858e..d20887ed6 100644 --- a/utils/threadpool/CMakeLists.txt +++ b/utils/threadpool/CMakeLists.txt @@ -8,4 +8,6 @@ set(threadpool_LIB_SRCS weightedthreadpool.cpp threadpool.cpp prioritythreadpool add_library(threadpool SHARED ${threadpool_LIB_SRCS}) +add_dependencies(threadpool loggingcpp) + install(TARGETS threadpool DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) diff --git a/utils/udfsdk/CMakeLists.txt b/utils/udfsdk/CMakeLists.txt index 2f47f5e66..8b55883c8 100755 --- a/utils/udfsdk/CMakeLists.txt +++ b/utils/udfsdk/CMakeLists.txt @@ -10,6 +10,8 @@ add_definitions(-DMYSQL_DYNAMIC_PLUGIN) add_library(udfsdk SHARED ${udfsdk_LIB_SRCS}) +add_dependencies(udfsdk loggingcpp) + install(TARGETS udfsdk DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) set(udf_mysql_LIB_SRCS udfmysql.cpp) diff --git a/writeengine/bulk/CMakeLists.txt b/writeengine/bulk/CMakeLists.txt index 19f49bbc1..9a4c4c37f 100644 --- a/writeengine/bulk/CMakeLists.txt +++ b/writeengine/bulk/CMakeLists.txt @@ -28,6 +28,8 @@ set(we_bulk_STAT_SRCS ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64) add_library(we_bulk STATIC ${we_bulk_STAT_SRCS}) +add_dependencies(we_bulk loggingcpp) + target_link_libraries(we_bulk ${NETSNMP_LIBRARIES}) REMOVE_DEFINITIONS(-D_FILE_OFFSET_BITS=64) diff --git a/writeengine/redistribute/CMakeLists.txt b/writeengine/redistribute/CMakeLists.txt index 6d6ac30df..3de34bd9d 100644 --- a/writeengine/redistribute/CMakeLists.txt +++ b/writeengine/redistribute/CMakeLists.txt @@ -11,6 +11,8 @@ set(writeengineredistribute_LIB_SRCS add_library(writeengineredistribute SHARED ${writeengineredistribute_LIB_SRCS}) +add_dependencies(writeengineredistribute loggingcpp) + target_link_libraries(writeengineredistribute ${NETSNMP_LIBRARIES}) target_compile_definitions(writeengineredistribute PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS) diff --git a/writeengine/wrapper/CMakeLists.txt b/writeengine/wrapper/CMakeLists.txt index 6f00e0c26..6051d83c5 100644 --- a/writeengine/wrapper/CMakeLists.txt +++ b/writeengine/wrapper/CMakeLists.txt @@ -39,6 +39,8 @@ add_definitions(-D_FILE_OFFSET_BITS=64) add_library(writeengine SHARED ${writeengine_LIB_SRCS}) +add_dependencies(writeengine loggingcpp) + target_link_libraries(writeengine ${NETSNMP_LIBRARIES}) install(TARGETS writeengine DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine) diff --git a/writeengine/xml/CMakeLists.txt b/writeengine/xml/CMakeLists.txt index ea9a1f059..bda4191d4 100644 --- a/writeengine/xml/CMakeLists.txt +++ b/writeengine/xml/CMakeLists.txt @@ -14,5 +14,7 @@ add_definitions(-D_FILE_OFFSET_BITS=64) add_library(we_xml STATIC ${we_xml_STAT_SRCS}) +add_dependencies(we_xml loggingcpp) + INSTALL(TARGETS we_xml DESTINATION ${ENGINE_LIBDIR})