From efff98d7ed18c16d48c986aca8ac92238115da8c Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <drrtuy@gmail.com>
Date: Wed, 24 Jan 2018 11:09:32 +0300
Subject: [PATCH] MCOL-548 Remove cmake warnings.

---
 dbcon/ddlpackage/CMakeLists.txt | 15 +++++++++------
 dbcon/dmlpackage/CMakeLists.txt | 15 +++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/dbcon/ddlpackage/CMakeLists.txt b/dbcon/ddlpackage/CMakeLists.txt
index 27d2a3015..16e388e93 100644
--- a/dbcon/ddlpackage/CMakeLists.txt
+++ b/dbcon/ddlpackage/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+INCLUDE_DIRECTORIES( ${ENGINE_COMMON_INCLUDES} )
 
 ADD_CUSTOM_COMMAND(
     OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/ddl-gram.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ddl-scan.cpp
@@ -9,9 +9,12 @@ ADD_CUSTOM_COMMAND(
     DEPENDS ddl.y ddl.l
 )
 
+ADD_CUSTOM_TARGET(ddl-lexer DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ddl-scan.cpp)
+ADD_CUSTOM_TARGET(ddl-parser DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ddl-gram.cpp)
+
 ########### next target ###############
 
-set(ddlpackage_LIB_SRCS
+SET(ddlpackage_LIB_SRCS
     serialize.cpp
     ddl-scan.cpp
     ddl-gram.cpp
@@ -30,11 +33,11 @@ set(ddlpackage_LIB_SRCS
     restorepartition.cpp
     droppartition.cpp)
 
-add_library(ddlpackage SHARED ${ddlpackage_LIB_SRCS})
+ADD_LIBRARY(ddlpackage SHARED ${ddlpackage_LIB_SRCS})
 
-add_dependencies(ddlpackage ${CMAKE_CURRENT_SOURCE_DIR}/ddl-gram.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ddl-scan.cpp)
+ADD_DEPENDENCIES(ddlpackage ddl-lexer ddl-parser)
 
-set_target_properties(ddlpackage PROPERTIES VERSION 1.0.0 SOVERSION 1)
+SET_TARGET_PROPERTIES(ddlpackage PROPERTIES VERSION 1.0.0 SOVERSION 1)
 
-install(TARGETS ddlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
+INSTALL(TARGETS ddlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
 
diff --git a/dbcon/dmlpackage/CMakeLists.txt b/dbcon/dmlpackage/CMakeLists.txt
index 43536a48d..618d97c97 100644
--- a/dbcon/dmlpackage/CMakeLists.txt
+++ b/dbcon/dmlpackage/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+INCLUDE_DIRECTORIES( ${ENGINE_COMMON_INCLUDES} )
 
 ADD_CUSTOM_COMMAND(
     OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/dml-gram.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dml-scan.cpp
@@ -9,9 +9,12 @@ ADD_CUSTOM_COMMAND(
     DEPENDS dml.y dml.l
 )
 
+ADD_CUSTOM_TARGET(dml-lexer DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dml-scan.cpp)
+ADD_CUSTOM_TARGET(dml-parser DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dml-gram.cpp)
+
 ########### next target ###############
 
-set(dmlpackage_LIB_SRCS
+SET(dmlpackage_LIB_SRCS
     dml-scan.cpp
     dml-gram.cpp
     calpontdmlfactory.cpp
@@ -30,11 +33,11 @@ set(dmlpackage_LIB_SRCS
     dmlpkg.cpp
     dmlparser.cpp)
 
-add_library(dmlpackage SHARED ${dmlpackage_LIB_SRCS})
+ADD_LIBRARY(dmlpackage SHARED ${dmlpackage_LIB_SRCS})
 
-add_dependencies(dmlpackage ${CMAKE_CURRENT_SOURCE_DIR}/dml-gram.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dml-scan.cpp)
+ADD_DEPENDENCIES(dmlpackage dml-lexer dml-parser)
 
-set_target_properties(dmlpackage PROPERTIES VERSION 1.0.0 SOVERSION 1)
+SET_TARGET_PROPERTIES(dmlpackage PROPERTIES VERSION 1.0.0 SOVERSION 1)
 
-install(TARGETS dmlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
+INSTALL(TARGETS dmlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)