This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/cxx14_framework_support
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to
refs/heads/feature/cxx14_framework_support by this push:
new f462d2e5 Fix typos in Doxyfile and conanfile.py
f462d2e5 is described below
commit f462d2e56bbe260ec56bd56f69e34badafc72294
Author: Pepijn Noltes <[email protected]>
AuthorDate: Sun Nov 6 15:04:38 2022 +0100
Fix typos in Doxyfile and conanfile.py
---
Doxyfile | 2 +-
conanfile.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Doxyfile b/Doxyfile
index af1b6727..baa4f159 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -61,7 +61,7 @@ PROJECT_NUMBER = latest
# for a project that appears at the top of each page and should give viewer a
# quick idea about the purpose of the project. Keep the description short.
-PROJECT_BRIEF = "AApache Celix is a framework for C, C++14 and C++17
to develop dynamic modular software applications using component and in-process
service-oriented programming."
+PROJECT_BRIEF = "Apache Celix is a framework for C, C++14 and C++17
to develop dynamic modular software applications using component and in-process
service-oriented programming."
# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
# in the documentation. The maximum height of the logo should not exceed 55
diff --git a/conanfile.py b/conanfile.py
index c5cb4eef..f0be6854 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -44,7 +44,7 @@ class CelixConan(ConanFile):
"enable_undefined_sanitizer": [True, False],
"enable_thread_sanitizer": [True, False],
"enable_testing_dependency_manager_for_cxx11": [True, False],
- "enable_testing_utils_and_framework_for_cxx14": [True, False],
+ "enable_testing_for_cxx14": [True, False],
"celix_add_openssl_dep": [True, False],
"build_all": [True, False],
"build_deployment_admin": [True, False],
@@ -91,7 +91,7 @@ class CelixConan(ConanFile):
"enable_undefined_sanitizer": False,
"enable_thread_sanitizer": False,
"enable_testing_dependency_manager_for_cxx11": False,
- "enable_testing_utils_and_framework_for_cxx14": False,
+ "eenable_testing_for_cxx14": False,
"celix_add_openssl_dep": False,
"build_all": False,
"build_deployment_admin": False,
