Integrate texrow with otexstream in order to perform automatic line

[lyx.git] / development / cmake / config.h.cmake

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 04feedf5795272692fd58b914dfc99b9fe99843e..e5db2e7303e982c564a54e9dd4ea7720bbafc54d 100644 (file)
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -12,6 +12,11 @@
 #ifndef _CONFIG_H
 #define _CONFIG_H
 
+// obligatory flags
+#define QT_NO_STL
+#define QT_NO_KEYWORDS
+#define HAVE_ICONV
+
 #include "configCompiler.h"
 
 #ifdef LYX_ENABLE_PCH
@@ -27,6 +32,8 @@
 #cmakedefine VERSION_INFO "${VERSION_INFO}"
 #cmakedefine LYX_DIR_VER "${LYX_DIR_VER}"
 #cmakedefine LYX_USERDIR_VER "${LYX_USERDIR_VER}"
+#define LYX_MAJOR_VERSION ${LYX_MAJOR_VERSION}
+#define LYX_MINOR_VERSION ${LYX_MINOR_VERSION}
 
 #define PROGRAM_SUFFIX "${PROGRAM_SUFFIX}"
 #define LYX_ABS_INSTALLED_DATADIR "${LYX_ABS_INSTALLED_DATADIR}"