sort tools, dep on logging for charset

Author: mariadb-LeonidFedorov

CMakeLists.txt

@@ -80,8 +80,3 @@ set(COMPONENTS
 foreach(component ${COMPONENTS})
     add_subdirectory(${component})
 endforeach()
-
-add_dependencies(udf_mysql GenError)
-add_dependencies(funcexp GenError)
-add_dependencies(oamcpp GenError)
-add_dependencies(regr_mysql GenError)

oamapps/CMakeLists.txt

@@ -1,3 +1,2 @@
 add_subdirectory(columnstoreDB)
-add_subdirectory(columnstoreSupport)
 add_subdirectory(postConfigure)

utils/CMakeLists.txt

@@ -1,28 +1,28 @@
 # add_subdirectory(boost_idb)
-add_subdirectory(startup)
-add_subdirectory(mariadb_charset)
+add_subdirectory(batchloader)
+add_subdirectory(cacheutils)
+add_subdirectory(cloudio)
 add_subdirectory(common)
+add_subdirectory(compress)
 add_subdirectory(configcpp)
-add_subdirectory(loggingcpp)
-add_subdirectory(messageqcpp)
-add_subdirectory(threadpool)
-add_subdirectory(rwlock)
 add_subdirectory(dataconvert)
-add_subdirectory(joiner)
-add_subdirectory(rowgroup)
-add_subdirectory(cacheutils)
-add_subdirectory(funcexp)
-add_subdirectory(udfsdk)
-add_subdirectory(compress)
-add_subdirectory(batchloader)
 add_subdirectory(ddlcleanup)
-add_subdirectory(querystats)
-add_subdirectory(windowfunction)
+add_subdirectory(funcexp)
 add_subdirectory(idbdatafile)
-add_subdirectory(querytele)
-add_subdirectory(libmysql_client)
-add_subdirectory(regr)
-add_subdirectory(cloudio)
+add_subdirectory(joiner)
 add_subdirectory(libmarias3)
+add_subdirectory(libmysql_client)
+add_subdirectory(loggingcpp)
+add_subdirectory(mariadb_charset)
+add_subdirectory(messageqcpp)
 add_subdirectory(pron)
+add_subdirectory(querystats)
+add_subdirectory(querytele)
+add_subdirectory(regr)
+add_subdirectory(rowgroup)
+add_subdirectory(rwlock)
+add_subdirectory(startup)
 add_subdirectory(statistics_manager)
+add_subdirectory(threadpool)
+add_subdirectory(udfsdk)
+add_subdirectory(windowfunction)

utils/mariadb_charset/CMakeLists.txt

@@ -4,3 +4,4 @@ include_directories(${ENGINE_COMMON_INCLUDES})
 
 columnstore_static_library(mariadb_charset charset.cpp)
 columnstore_link(mariadb_charset PRIVATE ${MARIADB_STRING_LIBS})
+add_dependencies(mariadb_charset loggingcpp)