This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git
commit 78a9dc15fa2bc014a7cd8584d47b4b56de9e41d7 Merge: e630684 b618e6a Author: Pepijn Noltes <[email protected]> AuthorDate: Sun May 17 16:05:42 2020 +0200 Merge tag 'rel/celix-2.2.1' Celix release X.Y.Z CHANGES.md | 6 ++++++ CMakeLists.txt | 2 +- libs/etcdlib/CMakeLists.txt | 23 ++++++++++++++++++++++- libs/etcdlib/README.md | 1 + 4 files changed, 30 insertions(+), 2 deletions(-) diff --cc CMakeLists.txt index abe182c,e008432..8c1ef30 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@@ -113,13 -88,10 +113,13 @@@ set(CMAKE_CXX_FLAGS_RELEASE "-O0 -DNDEB # Set version for the framework package/release set(CELIX_MAJOR "2") set(CELIX_MINOR "2") - set(CELIX_MICRO "0") + set(CELIX_MICRO "1") -option(ENABLE_TESTING "Enables unit/bundle testing" FALSE) +# Default bundle version +set(DEFAULT_VERSION 1.0.0) +# Options +option(ENABLE_TESTING "Enables unit/bundle testing" FALSE) if (ENABLE_TESTING) enable_testing() endif()
