From 6590561b561ee3277586cf92db7a4dbb34be752b Mon Sep 17 00:00:00 2001 From: Stuart Mark James <stuart.james@esrf.fr> Date: Thu, 18 Jul 2019 16:28:03 +0200 Subject: [PATCH] Fix build for clang, doc updates --- CHANGELOG.md | 7 +++++++ CMakeLists.txt | 12 +++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64b2592..f0f58fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,11 +7,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [0.9.1] - 2019-07-18 + ### Added - Google benchmark submodule for micro benchmarking. This will enabled future optimisation - Benchmark tests for QueryBuilder +### Fixed + +- Fix to build system - can build without Clang enabled now. +- Updates/corrections to docs + ## [0.9.0] - 2019-07-12 ### Added diff --git a/CMakeLists.txt b/CMakeLists.txt index 346a4cd..4fe382f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ set(LIBHDBPP_TIMESCALE_NAME "libhdb++timescale") # Versioning set(VERSION_MAJOR "0") set(VERSION_MINOR "9") -set(VERSION_PATCH "0") +set(VERSION_PATCH "1") set(VERSION_METADATA "") set(VERSION_STRING ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) @@ -145,10 +145,15 @@ set_target_properties(libhdbpp_timescale_shared_library LINK_FLAGS "-Wl,--no-undefined" CXX_STANDARD 14 POSITION_INDEPENDENT_CODE 1 - CXX_CLANG_TIDY ${DO_CLANG_TIDY} VERSION ${VERSION_STRING} SOVERSION ${VERSION_STRING}) +if(DO_CLANG_TIDY) + set_target_properties(libhdbpp_timescale_shared_library + PROPERTIES + CXX_CLANG_TIDY ${DO_CLANG_TIDY}) +endif(DO_CLANG_TIDY) + target_compile_options(libhdbpp_timescale_shared_library PRIVATE "$<$<CONFIG:DEBUG>:-g>") @@ -166,7 +171,8 @@ set_target_properties(libhdbpp_timescale_static_library CXX_STANDARD 14 EXCLUDE_FROM_ALL 1) -target_compile_options(libhdbpp_timescale_static_library PRIVATE "$<$<CONFIG:DEBUG>:-g>") +target_compile_options(libhdbpp_timescale_static_library + PRIVATE "$<$<CONFIG:DEBUG>:-g>") # Install Config ----------------------------------- install( -- GitLab