1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00

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

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

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)