Advertisement
KukuRuzo

rename config filename

Oct 29th, 2024
76
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
C++ 5.09 KB | None | 0 0
  1. diff --git a/Readme-dev-cmake-ru.txt b/Readme-dev-cmake-ru.txt
  2. index b2dca5b6..0e3071c3 100644
  3. --- a/Readme-dev-cmake-ru.txt
  4. +++ b/Readme-dev-cmake-ru.txt
  5. @@ -90,7 +90,7 @@
  6.          библиотек зависимостей в выходной каталог сборки при помощи модуля win32-prepare-deps.cmake
  7.      подключает каталог plugins, если включена опция и скопированы плагины
  8.  
  9. -./src/config.h.in - файл-шаблон для создания файла config.h
  10. +./src/psi_config.h.in - файл-шаблон для создания файла psi_config.h
  11.  
  12.  ./src/src.cmake:
  13.      содержит определения (definitions) определяющие функционал программы по-умолчанию
  14. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
  15. index e41c9492..6f37987b 100644
  16. --- a/src/CMakeLists.txt
  17. +++ b/src/CMakeLists.txt
  18. @@ -225,8 +225,8 @@ elseif(APPLE)
  19.      message(STATUS "${CLIENT_NAME} libraries directory: ${PSI_LIBDIR}")
  20.  endif()
  21.  
  22. -set(CONFIG_OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/config.h")
  23. -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CONFIG_OUTPUT_FILE} @ONLY)
  24. +set(CONFIG_OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/psi_config.h")
  25. +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/psi_config.h.in ${CONFIG_OUTPUT_FILE} @ONLY)
  26.  
  27.  prepare_iconsets(prepare-src)
  28.  #Generate iconsets.qrc and icondef.xml
  29. @@ -238,7 +238,7 @@ configure_file(${PROJECT_SOURCE_DIR}/iconsets.qrc.in ${ICONSETSQRC_OUTPUT_FILE}
  30.  #Include SOURCES HEADERS FORMS
  31.  include(src.cmake)
  32.  
  33. -#Append config.h to HEADERS list
  34. +#Append psi_config.h to HEADERS list
  35.  if(EXISTS "${CONFIG_OUTPUT_FILE}")
  36.      message(STATUS "${CONFIG_OUTPUT_FILE} file generated")
  37.      list(APPEND HEADERS ${CONFIG_OUTPUT_FILE})
  38. diff --git a/src/applicationinfo.cpp b/src/applicationinfo.cpp
  39. index f60794ae..a9fc1469 100644
  40. --- a/src/applicationinfo.cpp
  41. +++ b/src/applicationinfo.cpp
  42. @@ -1,7 +1,7 @@
  43.  #include "applicationinfo.h"
  44.  
  45.  #ifdef HAVE_CONFIG
  46. -#include "config.h"
  47. +#include "psi_config.h"
  48.  #endif
  49.  #include "profiles.h"
  50.  #include "systeminfo.h"
  51. diff --git a/src/config.h.in b/src/config.h.in
  52. deleted file mode 100644
  53. index 35a516a2..00000000
  54. --- a/src/config.h.in
  55. +++ /dev/null
  56. @@ -1,12 +0,0 @@
  57. -#cmakedefine CLIENT_NAME "@CLIENT_NAME@"
  58. -#cmakedefine CLIENT_SNAME "@CLIENT_SNAME@"
  59. -#cmakedefine CLIENT_CAPS_NODE "@CLIENT_CAPS_NODE@"
  60. -#cmakedefine PRODUCTION "@PRODUCTION@"
  61. -#cmakedefine SHARE_SUFF "@SHARE_SUFF@"
  62. -#cmakedefine PSI_LIBDIR "@PSI_LIBDIR@"
  63. -#cmakedefine PSI_DATADIR "@PSI_DATADIR@"
  64. -#cmakedefine PSI_VERSION "@PSI_VERSION@"
  65. -#cmakedefine PSI_REVISION "@PSI_REVISION@"
  66. -#cmakedefine PSI_PLUS_REVISION "@PSI_PLUS_REVISION@"
  67. -#cmakedefine PSI_COMPILATION_DATE "@PSI_COMPILATION_DATE@"
  68. -#cmakedefine PSI_COMPILATION_TIME "@PSI_COMPILATION_TIME@"
  69. diff --git a/src/debug.cpp b/src/debug.cpp
  70. index bb29c491..0502529d 100644
  71. --- a/src/debug.cpp
  72. +++ b/src/debug.cpp
  73. @@ -20,7 +20,7 @@
  74.  #include "debug.h"
  75.  
  76.  #include <QDir>
  77. -#include <config.h>
  78. +#include <psi_config.h>
  79.  
  80.  SlowTimer::SlowTimer(const QString &path, int line, int maxTime, const QString &message) :
  81.      _path(QDir::fromNativeSeparators(path)), _line(line), _message(message), _maxTime(maxTime)
  82. diff --git a/src/tools/crash/crash_sigsegv.cpp b/src/tools/crash/crash_sigsegv.cpp
  83. index 1306da0f..842bfdad 100644
  84. --- a/src/tools/crash/crash_sigsegv.cpp
  85. +++ b/src/tools/crash/crash_sigsegv.cpp
  86. @@ -25,7 +25,7 @@
  87.  
  88.  #include <assert.h>
  89.  #ifdef HAVE_CONFIG_H_
  90. -#include <config.h>
  91. +#include <psi_config.h>
  92.  #endif
  93.  #include <errno.h>
  94.  /*
  95. diff --git a/src/tools/spellchecker/hunspellchecker.cpp b/src/tools/spellchecker/hunspellchecker.cpp
  96. index bd28db2b..504b06e4 100644
  97. --- a/src/tools/spellchecker/hunspellchecker.cpp
  98. +++ b/src/tools/spellchecker/hunspellchecker.cpp
  99. @@ -28,7 +28,7 @@
  100.  #ifdef Q_OS_WIN
  101.  #include "applicationinfo.h"
  102.  #endif
  103. -#include "config.h"
  104. +#include "psi_config.h"
  105.  #include "languagemanager.h"
  106.  
  107.  #include <QCoreApplication>
  108. diff --git a/src/translationmanager.cpp b/src/translationmanager.cpp
  109. index ecaea74b..3877c599 100644
  110. --- a/src/translationmanager.cpp
  111. +++ b/src/translationmanager.cpp
  112. @@ -20,7 +20,7 @@
  113.  #include "translationmanager.h"
  114.  
  115.  #include "applicationinfo.h"
  116. -#include "config.h"
  117. +#include "psi_config.h"
  118.  #include "varlist.h"
  119.  
  120.  #include <QCoreApplication>
  121. diff --git a/src/psi_config.h.in b/src/psi_config.h.in
  122. new file mode 100644
  123. index 00000000..35a516a2
  124. --- /dev/null
  125. +++ b/src/psi_config.h.in
  126. @@ -0,0 +1,12 @@
  127. +#cmakedefine CLIENT_NAME "@CLIENT_NAME@"
  128. +#cmakedefine CLIENT_SNAME "@CLIENT_SNAME@"
  129. +#cmakedefine CLIENT_CAPS_NODE "@CLIENT_CAPS_NODE@"
  130. +#cmakedefine PRODUCTION "@PRODUCTION@"
  131. +#cmakedefine SHARE_SUFF "@SHARE_SUFF@"
  132. +#cmakedefine PSI_LIBDIR "@PSI_LIBDIR@"
  133. +#cmakedefine PSI_DATADIR "@PSI_DATADIR@"
  134. +#cmakedefine PSI_VERSION "@PSI_VERSION@"
  135. +#cmakedefine PSI_REVISION "@PSI_REVISION@"
  136. +#cmakedefine PSI_PLUS_REVISION "@PSI_PLUS_REVISION@"
  137. +#cmakedefine PSI_COMPILATION_DATE "@PSI_COMPILATION_DATE@"
  138. +#cmakedefine PSI_COMPILATION_TIME "@PSI_COMPILATION_TIME@"
  139.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement