This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch hotfix/release_build_issue in repository https://gitbox.apache.org/repos/asf/celix.git
commit 24ed53c49d4e7b3ce365127eb0950269d5d27bcc Author: Pepijn Noltes <[email protected]> AuthorDate: Wed Dec 29 19:39:25 2021 +0100 Fixes an issue when building and not using cmake type DEBUG --- examples/CMakeLists.txt | 4 +++- libs/framework/src/celix_libloader.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 316720b..0dfaf7a 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -27,9 +27,11 @@ # - cmake <loc_to_celix_src>/examples # - make -j all -cmake_minimum_required (VERSION 3.4) +cmake_minimum_required (VERSION 3.14) +cmake_policy(SET CMP0068 NEW) project (CelixUse C CXX) set(CMAKE_C_FLAGS "-D_GNU_SOURCE -std=gnu99 ${CMAKE_C_FLAGS}") set(CMAKE_CXX_STANDARD 17) +set(CELIX_CXX ON CACHE BOOL "C++ on") find_package(Celix REQUIRED) add_subdirectory(celix-examples examples) diff --git a/libs/framework/src/celix_libloader.c b/libs/framework/src/celix_libloader.c index c7d855d..9c18376 100644 --- a/libs/framework/src/celix_libloader.c +++ b/libs/framework/src/celix_libloader.c @@ -26,7 +26,7 @@ celix_library_handle_t* celix_libloader_open(celix_bundle_context_t *ctx, const char *libPath) { bool defaultNoDelete = true; #if defined(NDEBUG) - bool defaultNoDelete = false; + defaultNoDelete = false; #endif celix_library_handle_t* handle = NULL; bool noDelete = celix_bundleContext_getPropertyAsBool(ctx, CELIX_LOAD_BUNDLES_WITH_NODELETE, defaultNoDelete);
