commit e9d5fc01907a3f621b8951fe40e350f7ea1b6472
Author: Eugene Chornyi <[email protected]>
Date: Sat Jun 19 10:48:49 2021 +0200
prevent Qt6 from defining UNICODE (Qt6.1.1 and upwards)
---
src/CMakeLists.txt | 1 +
src/frontends/CMakeLists.txt | 2 +-
src/frontends/qt/CMakeLists.txt | 2 +-
src/graphics/CMakeLists.txt | 2 +-
src/insets/CMakeLists.txt | 2 +-
src/mathed/CMakeLists.txt | 2 +-
src/support/CMakeLists.txt | 2 +-
src/tex2lyx/CMakeLists.txt | 1 +
8 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3a4dffd..4debde6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -125,6 +125,7 @@ add_executable(${_lyx}
add_dependencies(${_lyx} lyx_version)
set_target_properties(${_lyx} PROPERTIES
+ QT_NO_UNICODE_DEFINES TRUE
FOLDER "applications/LyX"
INTERPROCEDURAL_OPTIMIZATION ${LYX_IPO_SUPPORTED})
lyx_add_gcc_pch(${_lyx})
diff --git a/src/frontends/CMakeLists.txt b/src/frontends/CMakeLists.txt
index 97e1265..7b5fde3 100644
--- a/src/frontends/CMakeLists.txt
+++ b/src/frontends/CMakeLists.txt
@@ -20,7 +20,7 @@ else()
lyx_const_touched_files(_allinone frontends_sources)
add_library(frontends ${library_type} ${_allinone_files})
endif()
-set_target_properties(frontends PROPERTIES FOLDER "applications/LyX")
+set_target_properties(frontends PROPERTIES FOLDER "applications/LyX"
QT_NO_UNICODE_DEFINES TRUE)
target_link_libraries(frontends ${Lyx_Boost_Libraries})
diff --git a/src/frontends/qt/CMakeLists.txt b/src/frontends/qt/CMakeLists.txt
index 4c2f454..282db37 100644
--- a/src/frontends/qt/CMakeLists.txt
+++ b/src/frontends/qt/CMakeLists.txt
@@ -41,7 +41,7 @@ if(LYX_MERGE_FILES)
else()
add_library(frontend_qt ${library_type} ${frontends_qt_sources}
${frontends_qt_headers} ${ui_files} ${resource_files})
endif()
-set_target_properties(frontend_qt PROPERTIES FOLDER "applications/LyX")
+set_target_properties(frontend_qt PROPERTIES FOLDER "applications/LyX"
QT_NO_UNICODE_DEFINES TRUE)
if(Qt5Core_FOUND AND APPLE)
qt_use_modules(frontend_qt Core Gui Widgets Concurrent Svg MacExtras)
diff --git a/src/graphics/CMakeLists.txt b/src/graphics/CMakeLists.txt
index a6fbffa..fcdeb24 100644
--- a/src/graphics/CMakeLists.txt
+++ b/src/graphics/CMakeLists.txt
@@ -21,7 +21,7 @@ else()
lyx_const_touched_files(_allinone graphics_sources)
add_library(graphics ${library_type} ${_allinone_files})
endif()
-set_target_properties(graphics PROPERTIES FOLDER "applications/LyX")
+set_target_properties(graphics PROPERTIES FOLDER "applications/LyX"
QT_NO_UNICODE_DEFINES TRUE)
qt_use_modules(graphics Core)
lyx_add_gcc_pch(graphics)
diff --git a/src/insets/CMakeLists.txt b/src/insets/CMakeLists.txt
index 0a8c04c..5f6282f 100644
--- a/src/insets/CMakeLists.txt
+++ b/src/insets/CMakeLists.txt
@@ -22,7 +22,7 @@ else()
lyx_const_touched_files(_allinone insets_sources)
add_library(insets ${library_type} ${_allinone_files})
endif()
-set_target_properties(insets PROPERTIES FOLDER "applications/LyX")
+set_target_properties(insets PROPERTIES FOLDER "applications/LyX"
QT_NO_UNICODE_DEFINES TRUE)
qt_use_modules(insets Gui)
diff --git a/src/mathed/CMakeLists.txt b/src/mathed/CMakeLists.txt
index c47ca6b..6b142e3 100644
--- a/src/mathed/CMakeLists.txt
+++ b/src/mathed/CMakeLists.txt
@@ -19,7 +19,7 @@ else()
lyx_const_touched_files(_allinone mathed_sources)
add_library(mathed ${library_type} ${_allinone_files})
endif()
-set_target_properties(mathed PROPERTIES FOLDER "applications/LyX")
+set_target_properties(mathed PROPERTIES FOLDER "applications/LyX"
QT_NO_UNICODE_DEFINES TRUE)
qt_use_modules(mathed Core)
lyx_add_gcc_pch(mathed)
diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt
index 99b4383..de0328e 100644
--- a/src/support/CMakeLists.txt
+++ b/src/support/CMakeLists.txt
@@ -78,7 +78,7 @@ else()
add_library(support ${library_type} ${_allinone_files}
${support_separate}
${support_linkback_sources} ${support_headers} ${dont_merge})
endif()
-set_target_properties(support PROPERTIES FOLDER "applications/LyX")
+set_target_properties(support PROPERTIES FOLDER "applications/LyX"
QT_NO_UNICODE_DEFINES TRUE)
qt_use_modules(support Core Gui)
diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index be219b8..7976813 100644
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -41,6 +41,7 @@ else()
endif()
set_target_properties(${_tex2lyx} PROPERTIES
FOLDER "applications/TeX2LyX"
+ QT_NO_UNICODE_DEFINES TRUE
INTERPROCEDURAL_OPTIMIZATION ${LYX_IPO_SUPPORTED})
target_link_libraries(${_tex2lyx}
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
