diff options
| -rw-r--r-- | doc/Doxyfile.in | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/base/QXmppBuildConstants.h.in (renamed from src/base/QXmppGlobal.h.in) | 6 | ||||
| -rw-r--r-- | src/base/QXmppGlobal.h | 12 |
4 files changed, 19 insertions, 6 deletions
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index c0847971..7173e5de 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -7,7 +7,7 @@ PROJECT_NUMBER = "Version: @PROJECT_VERSION@" INPUT = @PROJECT_SOURCE_DIR@/doc/index.doc \ @PROJECT_SOURCE_DIR@/doc/using.doc \ @PROJECT_SOURCE_DIR@/doc/xep.doc \ - @CMAKE_BINARY_DIR@/src/base/QXmppGlobal.h \ + @CMAKE_BINARY_DIR@/src/base/QXmppBuildConstants.h \ @PROJECT_SOURCE_DIR@/src ALIASES = "xep{1}=<a href=\"https://xmpp.org/extensions/xep-\1.html\">XEP-\1</a>" \ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cb9a04f1..ec5686ff 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,11 +16,11 @@ if(BUILD_SHARED) else() set(QXMPP_BUILD_SHARED false) endif() -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/base/QXmppGlobal.h.in ${CMAKE_CURRENT_BINARY_DIR}/base/QXmppGlobal.h @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/base/QXmppBuildConstants.h.in ${CMAKE_CURRENT_BINARY_DIR}/base/QXmppBuildConstants.h @ONLY) include_directories(${CMAKE_CURRENT_BINARY_DIR}/base) set(INSTALL_HEADER_FILES - ${CMAKE_CURRENT_BINARY_DIR}/base/QXmppGlobal.h + ${CMAKE_CURRENT_BINARY_DIR}/base/QXmppBuildConstants.h # Base base/QXmppArchiveIq.h @@ -38,6 +38,7 @@ set(INSTALL_HEADER_FILES base/QXmppEntityTimeIq.h base/QXmppFutureUtils_p.h base/QXmppGeolocItem.h + base/QXmppGlobal.h base/QXmppHttpUploadIq.h base/QXmppIbbIq.h base/QXmppIq.h diff --git a/src/base/QXmppGlobal.h.in b/src/base/QXmppBuildConstants.h.in index 61b2e965..5e9d7f96 100644 --- a/src/base/QXmppGlobal.h.in +++ b/src/base/QXmppBuildConstants.h.in @@ -4,8 +4,8 @@ // // SPDX-License-Identifier: LGPL-2.1-or-later -#ifndef QXMPPGLOBAL_H -#define QXMPPGLOBAL_H +#ifndef QXMPPBUILDCONSTANTS_H +#define QXMPPBUILDCONSTANTS_H #include <QString> @@ -106,4 +106,4 @@ struct Success } -#endif // QXMPPGLOBAL_H +#endif // QXMPPBUILDCONSTANTS_H diff --git a/src/base/QXmppGlobal.h b/src/base/QXmppGlobal.h new file mode 100644 index 00000000..d71037bd --- /dev/null +++ b/src/base/QXmppGlobal.h @@ -0,0 +1,12 @@ +// SPDX-FileCopyrightText: 2010 Manjeet Dahiya <manjeetdahiya@gmail.com> +// SPDX-FileCopyrightText: 2017 Niels Ole Salscheider <niels_ole@salscheider-online.de> +// SPDX-FileCopyrightText: 2019 Linus Jahn <lnj@kaidan.im> +// +// SPDX-License-Identifier: LGPL-2.1-or-later + +#ifndef QXMPPGLOBAL_H +#define QXMPPGLOBAL_H + +#include "QXmppBuildConstants.h" + +#endif // QXMPPGLOBAL_H |