Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/Readme-dev-cmake-ru.txt b/Readme-dev-cmake-ru.txt
- index b2dca5b6..0e3071c3 100644
- --- a/Readme-dev-cmake-ru.txt
- +++ b/Readme-dev-cmake-ru.txt
- @@ -90,7 +90,7 @@
- библиотек зависимостей в выходной каталог сборки при помощи модуля win32-prepare-deps.cmake
- подключает каталог plugins, если включена опция и скопированы плагины
- -./src/config.h.in - файл-шаблон для создания файла config.h
- +./src/psi_config.h.in - файл-шаблон для создания файла psi_config.h
- ./src/src.cmake:
- содержит определения (definitions) определяющие функционал программы по-умолчанию
- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
- index e41c9492..6f37987b 100644
- --- a/src/CMakeLists.txt
- +++ b/src/CMakeLists.txt
- @@ -225,8 +225,8 @@ elseif(APPLE)
- message(STATUS "${CLIENT_NAME} libraries directory: ${PSI_LIBDIR}")
- endif()
- -set(CONFIG_OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/config.h")
- -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CONFIG_OUTPUT_FILE} @ONLY)
- +set(CONFIG_OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/psi_config.h")
- +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/psi_config.h.in ${CONFIG_OUTPUT_FILE} @ONLY)
- prepare_iconsets(prepare-src)
- #Generate iconsets.qrc and icondef.xml
- @@ -238,7 +238,7 @@ configure_file(${PROJECT_SOURCE_DIR}/iconsets.qrc.in ${ICONSETSQRC_OUTPUT_FILE}
- #Include SOURCES HEADERS FORMS
- include(src.cmake)
- -#Append config.h to HEADERS list
- +#Append psi_config.h to HEADERS list
- if(EXISTS "${CONFIG_OUTPUT_FILE}")
- message(STATUS "${CONFIG_OUTPUT_FILE} file generated")
- list(APPEND HEADERS ${CONFIG_OUTPUT_FILE})
- diff --git a/src/applicationinfo.cpp b/src/applicationinfo.cpp
- index f60794ae..a9fc1469 100644
- --- a/src/applicationinfo.cpp
- +++ b/src/applicationinfo.cpp
- @@ -1,7 +1,7 @@
- #include "applicationinfo.h"
- #ifdef HAVE_CONFIG
- -#include "config.h"
- +#include "psi_config.h"
- #endif
- #include "profiles.h"
- #include "systeminfo.h"
- diff --git a/src/config.h.in b/src/config.h.in
- deleted file mode 100644
- index 35a516a2..00000000
- --- a/src/config.h.in
- +++ /dev/null
- @@ -1,12 +0,0 @@
- -#cmakedefine CLIENT_NAME "@CLIENT_NAME@"
- -#cmakedefine CLIENT_SNAME "@CLIENT_SNAME@"
- -#cmakedefine CLIENT_CAPS_NODE "@CLIENT_CAPS_NODE@"
- -#cmakedefine PRODUCTION "@PRODUCTION@"
- -#cmakedefine SHARE_SUFF "@SHARE_SUFF@"
- -#cmakedefine PSI_LIBDIR "@PSI_LIBDIR@"
- -#cmakedefine PSI_DATADIR "@PSI_DATADIR@"
- -#cmakedefine PSI_VERSION "@PSI_VERSION@"
- -#cmakedefine PSI_REVISION "@PSI_REVISION@"
- -#cmakedefine PSI_PLUS_REVISION "@PSI_PLUS_REVISION@"
- -#cmakedefine PSI_COMPILATION_DATE "@PSI_COMPILATION_DATE@"
- -#cmakedefine PSI_COMPILATION_TIME "@PSI_COMPILATION_TIME@"
- diff --git a/src/debug.cpp b/src/debug.cpp
- index bb29c491..0502529d 100644
- --- a/src/debug.cpp
- +++ b/src/debug.cpp
- @@ -20,7 +20,7 @@
- #include "debug.h"
- #include <QDir>
- -#include <config.h>
- +#include <psi_config.h>
- SlowTimer::SlowTimer(const QString &path, int line, int maxTime, const QString &message) :
- _path(QDir::fromNativeSeparators(path)), _line(line), _message(message), _maxTime(maxTime)
- diff --git a/src/tools/crash/crash_sigsegv.cpp b/src/tools/crash/crash_sigsegv.cpp
- index 1306da0f..842bfdad 100644
- --- a/src/tools/crash/crash_sigsegv.cpp
- +++ b/src/tools/crash/crash_sigsegv.cpp
- @@ -25,7 +25,7 @@
- #include <assert.h>
- #ifdef HAVE_CONFIG_H_
- -#include <config.h>
- +#include <psi_config.h>
- #endif
- #include <errno.h>
- /*
- diff --git a/src/tools/spellchecker/hunspellchecker.cpp b/src/tools/spellchecker/hunspellchecker.cpp
- index bd28db2b..504b06e4 100644
- --- a/src/tools/spellchecker/hunspellchecker.cpp
- +++ b/src/tools/spellchecker/hunspellchecker.cpp
- @@ -28,7 +28,7 @@
- #ifdef Q_OS_WIN
- #include "applicationinfo.h"
- #endif
- -#include "config.h"
- +#include "psi_config.h"
- #include "languagemanager.h"
- #include <QCoreApplication>
- diff --git a/src/translationmanager.cpp b/src/translationmanager.cpp
- index ecaea74b..3877c599 100644
- --- a/src/translationmanager.cpp
- +++ b/src/translationmanager.cpp
- @@ -20,7 +20,7 @@
- #include "translationmanager.h"
- #include "applicationinfo.h"
- -#include "config.h"
- +#include "psi_config.h"
- #include "varlist.h"
- #include <QCoreApplication>
- diff --git a/src/psi_config.h.in b/src/psi_config.h.in
- new file mode 100644
- index 00000000..35a516a2
- --- /dev/null
- +++ b/src/psi_config.h.in
- @@ -0,0 +1,12 @@
- +#cmakedefine CLIENT_NAME "@CLIENT_NAME@"
- +#cmakedefine CLIENT_SNAME "@CLIENT_SNAME@"
- +#cmakedefine CLIENT_CAPS_NODE "@CLIENT_CAPS_NODE@"
- +#cmakedefine PRODUCTION "@PRODUCTION@"
- +#cmakedefine SHARE_SUFF "@SHARE_SUFF@"
- +#cmakedefine PSI_LIBDIR "@PSI_LIBDIR@"
- +#cmakedefine PSI_DATADIR "@PSI_DATADIR@"
- +#cmakedefine PSI_VERSION "@PSI_VERSION@"
- +#cmakedefine PSI_REVISION "@PSI_REVISION@"
- +#cmakedefine PSI_PLUS_REVISION "@PSI_PLUS_REVISION@"
- +#cmakedefine PSI_COMPILATION_DATE "@PSI_COMPILATION_DATE@"
- +#cmakedefine PSI_COMPILATION_TIME "@PSI_COMPILATION_TIME@"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement