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

MCOL-548 Remove cmake warnings.

This commit is contained in:
Roman Nozdrin
2018-01-24 11:09:32 +03:00
parent 881e7a2ff8
commit efff98d7ed
2 changed files with 18 additions and 12 deletions

View File

@ -1,5 +1,5 @@
include_directories( ${ENGINE_COMMON_INCLUDES} ) INCLUDE_DIRECTORIES( ${ENGINE_COMMON_INCLUDES} )
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/ddl-gram.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ddl-scan.cpp 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 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 ############### ########### next target ###############
set(ddlpackage_LIB_SRCS SET(ddlpackage_LIB_SRCS
serialize.cpp serialize.cpp
ddl-scan.cpp ddl-scan.cpp
ddl-gram.cpp ddl-gram.cpp
@ -30,11 +33,11 @@ set(ddlpackage_LIB_SRCS
restorepartition.cpp restorepartition.cpp
droppartition.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)

View File

@ -1,5 +1,5 @@
include_directories( ${ENGINE_COMMON_INCLUDES} ) INCLUDE_DIRECTORIES( ${ENGINE_COMMON_INCLUDES} )
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/dml-gram.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dml-scan.cpp 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 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 ############### ########### next target ###############
set(dmlpackage_LIB_SRCS SET(dmlpackage_LIB_SRCS
dml-scan.cpp dml-scan.cpp
dml-gram.cpp dml-gram.cpp
calpontdmlfactory.cpp calpontdmlfactory.cpp
@ -30,11 +33,11 @@ set(dmlpackage_LIB_SRCS
dmlpkg.cpp dmlpkg.cpp
dmlparser.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)