Merge branch '2.2' into develop

This commit is contained in:
Markus Mäkelä
2018-08-07 22:20:27 +03:00
8 changed files with 232 additions and 60 deletions

View File

@ -3,11 +3,13 @@ add_library(cdc_connector SHARED cdc_connector.cpp)
add_dependencies(cdc_connector jansson)
target_link_libraries(cdc_connector ${JANSSON_LIBRARIES} crypto)
set_target_properties(cdc_connector PROPERTIES VERSION "1.0.0")
add_dependencies(cdc_connector jansson)
# Static version of the library
add_library(cdc_connector_static STATIC cdc_connector.cpp)
add_dependencies(cdc_connector_static jansson)
set_target_properties(cdc_connector_static PROPERTIES OUTPUT_NAME cdc_connector)
add_dependencies(cdc_connector_static jansson)
install_dev_library(cdc_connector cdc-connector)
install_dev_library(cdc_connector_static cdc-connector)