Fix QSCINTILLA_VERSION_STR redefinition warnings emitted on

newer QScintilla versions due to presence of QSCINTILLA_VERSION_STR in QSci headers
qgis · Feb 23, 2021 · 53bf2cf · 53bf2cf
1 parent fc1ac8b
commit 53bf2cf
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
@@ -35,7 +35,9 @@
 
 #define QGIS_SERVER_MODULE_SUBDIR "${QGIS_SERVER_MODULE_SUBDIR}"
 
+#if !defined(QSCINTILLA_VERSION_STR)
 #define QSCINTILLA_VERSION_STR "${QSCINTILLA_VERSION_STR}"
+#endif
 
 #if defined( __APPLE__ )
 //used by Mac to find system or bundle resources relative to amount of bundling