This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/cxx_rsa_update
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/feature/cxx_rsa_update by this
push:
new 6b4f63e Fixes an install issue and remove INTERFACE std=c++17 from
rsa_spi
6b4f63e is described below
commit 6b4f63ef104f9d3f7eda612a2ca4d27d8846256e
Author: Pepijn Noltes <[email protected]>
AuthorDate: Mon May 10 22:28:06 2021 +0200
Fixes an install issue and remove INTERFACE std=c++17 from rsa_spi
---
bundles/cxx_remote_services/admin/CMakeLists.txt | 1 +
bundles/cxx_remote_services/admin/gtest/CMakeLists.txt | 3 ++-
bundles/cxx_remote_services/discovery_configured/CMakeLists.txt | 2 +-
.../cxx_remote_services/discovery_configured/gtest/CMakeLists.txt | 2 ++
bundles/cxx_remote_services/integration/CMakeLists.txt | 1 +
bundles/cxx_remote_services/rsa_spi/CMakeLists.txt | 3 ++-
bundles/logging/log_helper/CMakeLists.txt | 2 +-
libs/promises/api/celix/impl/SharedPromiseState.h | 5 +++--
8 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/bundles/cxx_remote_services/admin/CMakeLists.txt
b/bundles/cxx_remote_services/admin/CMakeLists.txt
index 4aee864..4a6dac3 100644
--- a/bundles/cxx_remote_services/admin/CMakeLists.txt
+++ b/bundles/cxx_remote_services/admin/CMakeLists.txt
@@ -30,6 +30,7 @@ target_link_libraries(RemoteServiceAdmin PRIVATE
Celix::framework
Celix::log_helper
)
+target_compile_options(RemoteServiceAdmin PRIVATE -std=c++17)
install_celix_bundle(RemoteServiceAdmin EXPORT celix COMPONENT rsa)
#Setup target aliases to match external usage
diff --git a/bundles/cxx_remote_services/admin/gtest/CMakeLists.txt
b/bundles/cxx_remote_services/admin/gtest/CMakeLists.txt
index 42e2ce8..878a555 100644
--- a/bundles/cxx_remote_services/admin/gtest/CMakeLists.txt
+++ b/bundles/cxx_remote_services/admin/gtest/CMakeLists.txt
@@ -18,8 +18,9 @@
add_executable(test_cxx_remote_service_admin
src/RemoteServiceAdminTestSuite.cc
)
-
target_link_libraries(test_cxx_remote_service_admin PRIVATE Celix::framework
GTest::gtest GTest::gtest_main Celix::rsa_spi)
+target_compile_options(test_cxx_remote_service_admin PRIVATE -std=c++17)
+
add_dependencies(test_cxx_remote_service_admin RemoteServiceAdmin_bundle)
celix_get_bundle_file(RemoteServiceAdmin REMOTE_SERVICE_ADMIN_BUNDLE_LOCATION)
diff --git a/bundles/cxx_remote_services/discovery_configured/CMakeLists.txt
b/bundles/cxx_remote_services/discovery_configured/CMakeLists.txt
index cccd2a1..833b718 100644
--- a/bundles/cxx_remote_services/discovery_configured/CMakeLists.txt
+++ b/bundles/cxx_remote_services/discovery_configured/CMakeLists.txt
@@ -39,8 +39,8 @@ target_link_libraries(RsaConfiguredDiscovery PRIVATE
Celix::log_helper
)
target_include_directories(RsaConfiguredDiscovery PRIVATE src)
+target_compile_options(RsaConfiguredDiscovery PRIVATE -std=c++17)
install_celix_bundle(RsaConfiguredDiscovery EXPORT celix COMPONENT rsa)
-target_compile_options(RsaConfiguredDiscovery INTERFACE -std=c++17)
add_library(Celix::RsaConfiguredDiscovery ALIAS RsaConfiguredDiscovery)
if (ENABLE_TESTING)
diff --git
a/bundles/cxx_remote_services/discovery_configured/gtest/CMakeLists.txt
b/bundles/cxx_remote_services/discovery_configured/gtest/CMakeLists.txt
index 710440b..8e197fe 100644
--- a/bundles/cxx_remote_services/discovery_configured/gtest/CMakeLists.txt
+++ b/bundles/cxx_remote_services/discovery_configured/gtest/CMakeLists.txt
@@ -20,6 +20,8 @@ add_executable(test_cxx_rsa_configured_discovery
)
target_link_libraries(test_cxx_rsa_configured_discovery PRIVATE
Celix::framework GTest::gtest GTest::gtest_main Celix::rsa_spi
RsaConfiguredDiscovery_api)
+target_compile_options(test_cxx_rsa_configured_discovery PRIVATE -std=c++17)
+
add_dependencies(test_cxx_rsa_configured_discovery
RsaConfiguredDiscovery_bundle)
celix_get_bundle_file(RsaConfiguredDiscovery
RSA_CONFIGURED_DISCOVERY_BUNDLE_LOCATION)
diff --git a/bundles/cxx_remote_services/integration/CMakeLists.txt
b/bundles/cxx_remote_services/integration/CMakeLists.txt
index cad4fec..d12a42f 100644
--- a/bundles/cxx_remote_services/integration/CMakeLists.txt
+++ b/bundles/cxx_remote_services/integration/CMakeLists.txt
@@ -19,6 +19,7 @@ add_celix_bundle(TestExportImportRemoteServiceFactory
SOURCES src/TestExportImportRemoteServiceFactory.cc
)
target_link_libraries(TestExportImportRemoteServiceFactory PRIVATE
Celix::rsa_spi Celix::pubsub_api Celix::Promises Celix::log_helper)
+target_compile_options(TestExportImportRemoteServiceFactory PRIVATE
-std=c++17) #TODO how can this be improved (bring back -std=c++17 on INTERFACE
for promises?
target_include_directories(TestExportImportRemoteServiceFactory PRIVATE
include)
#TODO improve with serializer svc, for now using descriptors
celix_bundle_files(TestExportImportRemoteServiceFactory
diff --git a/bundles/cxx_remote_services/rsa_spi/CMakeLists.txt
b/bundles/cxx_remote_services/rsa_spi/CMakeLists.txt
index 47568ff..73e944b 100644
--- a/bundles/cxx_remote_services/rsa_spi/CMakeLists.txt
+++ b/bundles/cxx_remote_services/rsa_spi/CMakeLists.txt
@@ -20,7 +20,8 @@ target_include_directories(rsa_spi INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
$<INSTALL_INTERFACE:include/celix/rsa>
)
-target_compile_options(rsa_spi INTERFACE -std=c++17)
+#TODO TBD is it smart to add a c++ std as INTERFACE option?
+#target_compile_options(rsa_spi INTERFACE -std=c++17)
install(TARGETS rsa_spi EXPORT celix DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT rsa)
install(DIRECTORY include/ DESTINATION include/celix/rsa COMPONENT rsa)
diff --git a/bundles/logging/log_helper/CMakeLists.txt
b/bundles/logging/log_helper/CMakeLists.txt
index 65d89a9..6e60f8d 100644
--- a/bundles/logging/log_helper/CMakeLists.txt
+++ b/bundles/logging/log_helper/CMakeLists.txt
@@ -36,7 +36,7 @@ if (CELIX_INSTALL_DEPRECATED_API)
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include_v1>
$<INSTALL_INTERFACE:include/celix/log_helper>
)
- install(DIRECTORY include_v2/ DESTINATION include/celix/log_helper)
+ install(DIRECTORY include_v1/ DESTINATION include/celix/log_helper)
endif ()
add_library(Celix::log_helper ALIAS log_helper)
diff --git a/libs/promises/api/celix/impl/SharedPromiseState.h
b/libs/promises/api/celix/impl/SharedPromiseState.h
index e108392..370cdee 100644
--- a/libs/promises/api/celix/impl/SharedPromiseState.h
+++ b/libs/promises/api/celix/impl/SharedPromiseState.h
@@ -44,7 +44,7 @@ namespace celix::impl {
public:
static std::shared_ptr<SharedPromiseState<T>>
create(std::shared_ptr<celix::IExecutor> _executor,
std::shared_ptr<celix::IScheduledExecutor> _scheduledExecutor, int priority);
- ~SharedPromiseState() = default;
+ ~SharedPromiseState() noexcept = default;
void resolve(T&& value);
@@ -145,7 +145,8 @@ namespace celix::impl {
class SharedPromiseState<void> {
public:
static std::shared_ptr<SharedPromiseState<void>>
create(std::shared_ptr<celix::IExecutor> _executor,
std::shared_ptr<celix::IScheduledExecutor> _scheduledExecutor, int priority);
- ~SharedPromiseState() = default;
+
+ ~SharedPromiseState() noexcept = default;
void resolve();
