anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 03:11:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

prevent Qt6 from defining UNICODE (Qt6.1.1 and upwards)

Browse Source
This commit is contained in:
Eugene Chornyi 2021-06-19 10:48:49 +02:00
parent b9334a046c
commit e9d5fc0190
8 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@ -125,6 +125,7 @@ add_executable(${_lyx}
add_dependencies(${_lyx} lyx_version) add_dependencies(${_lyx} lyx_version)
set_target_properties(${_lyx} PROPERTIES set_target_properties(${_lyx} PROPERTIES
QT_NO_UNICODE_DEFINES TRUE
FOLDER "applications/LyX" FOLDER "applications/LyX"
INTERPROCEDURAL_OPTIMIZATION ${LYX_IPO_SUPPORTED}) INTERPROCEDURAL_OPTIMIZATION ${LYX_IPO_SUPPORTED})
lyx_add_gcc_pch(${_lyx}) lyx_add_gcc_pch(${_lyx})

2
src/frontends/CMakeLists.txt
View File

@ -20,7 +20,7 @@ else()
lyx_const_touched_files(_allinone frontends_sources) lyx_const_touched_files(_allinone frontends_sources)
add_library(frontends ${library_type} ${_allinone_files}) add_library(frontends ${library_type} ${_allinone_files})
endif() 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}) target_link_libraries(frontends ${Lyx_Boost_Libraries})

2
src/frontends/qt/CMakeLists.txt
View File

@ -41,7 +41,7 @@ if(LYX_MERGE_FILES)
else() else()
add_library(frontend_qt ${library_type} ${frontends_qt_sources} ${frontends_qt_headers} ${ui_files} ${resource_files}) add_library(frontend_qt ${library_type} ${frontends_qt_sources} ${frontends_qt_headers} ${ui_files} ${resource_files})
endif() 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) if(Qt5Core_FOUND AND APPLE)
qt_use_modules(frontend_qt Core Gui Widgets Concurrent Svg MacExtras) qt_use_modules(frontend_qt Core Gui Widgets Concurrent Svg MacExtras)

2
src/graphics/CMakeLists.txt
View File

@ -21,7 +21,7 @@ else()
lyx_const_touched_files(_allinone graphics_sources) lyx_const_touched_files(_allinone graphics_sources)
add_library(graphics ${library_type} ${_allinone_files}) add_library(graphics ${library_type} ${_allinone_files})
endif() 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) qt_use_modules(graphics Core)
lyx_add_gcc_pch(graphics) lyx_add_gcc_pch(graphics)

2
src/insets/CMakeLists.txt
View File

@ -22,7 +22,7 @@ else()
lyx_const_touched_files(_allinone insets_sources) lyx_const_touched_files(_allinone insets_sources)
add_library(insets ${library_type} ${_allinone_files}) add_library(insets ${library_type} ${_allinone_files})
endif() 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) qt_use_modules(insets Gui)

2
src/mathed/CMakeLists.txt
View File

@ -19,7 +19,7 @@ else()
lyx_const_touched_files(_allinone mathed_sources) lyx_const_touched_files(_allinone mathed_sources)
add_library(mathed ${library_type} ${_allinone_files}) add_library(mathed ${library_type} ${_allinone_files})
endif() 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) qt_use_modules(mathed Core)
lyx_add_gcc_pch(mathed) lyx_add_gcc_pch(mathed)

2
src/support/CMakeLists.txt
View File

@ -78,7 +78,7 @@ else()
add_library(support ${library_type} ${_allinone_files} ${support_separate} add_library(support ${library_type} ${_allinone_files} ${support_separate}
${support_linkback_sources} ${support_headers} ${dont_merge}) ${support_linkback_sources} ${support_headers} ${dont_merge})
endif() 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) qt_use_modules(support Core Gui)

1
src/tex2lyx/CMakeLists.txt
View File

@ -41,6 +41,7 @@ else()
endif() endif()
set_target_properties(${_tex2lyx} PROPERTIES set_target_properties(${_tex2lyx} PROPERTIES
FOLDER "applications/TeX2LyX" FOLDER "applications/TeX2LyX"
QT_NO_UNICODE_DEFINES TRUE
INTERPROCEDURAL_OPTIMIZATION ${LYX_IPO_SUPPORTED}) INTERPROCEDURAL_OPTIMIZATION ${LYX_IPO_SUPPORTED})
target_link_libraries(${_tex2lyx} target_link_libraries(${_tex2lyx}