[LyX/master] Cmake build Qt6: Remove some redundant statements.

Kornel Benko kornel at lyx.org
Wed Mar 24 10:37:07 UTC 2021


commit 92a50fa273625600599e2b25673b0d97dc8e44ef
Author: Kornel Benko <kornel at lyx.org>
Date:   Wed Mar 24 11:42:39 2021 +0100

    Cmake build Qt6: Remove some redundant statements.
---
 src/CMakeLists.txt               |    1 -
 src/client/CMakeLists.txt        |    3 +--
 src/support/tests/CMakeLists.txt |    2 +-
 src/tex2lyx/CMakeLists.txt       |    1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 84373da..3a4dffd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -142,7 +142,6 @@ target_link_libraries(${_lyx}
 	${vld_dll})
 
 qt_use_modules(${_lyx} Core Gui ${QtCore5CompatModule})
-target_link_libraries(${_lyx} ${QtCore5CompatLibrary})
 
 if(QT_USES_X11)
   find_package(X11 REQUIRED)
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index c64ada8..4108958 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -26,8 +26,7 @@ target_link_libraries(${_lyxclient}
 	${Lyx_Boost_Libraries}
 	${ICONV_LIBRARY}
 	${QT_QTCORE_LIBRARY}
-	${QT_QTGUI_LIBRARY}
-	${QtCore5CompatLibrary})
+	${QT_QTGUI_LIBRARY})
 
 qt_use_modules(${_lyxclient} ${QtCore5CompatModule})
 lyx_target_link_libraries(${_lyxclient} Magic ASPELL)
diff --git a/src/support/tests/CMakeLists.txt b/src/support/tests/CMakeLists.txt
index 4667077..cbfa70a 100644
--- a/src/support/tests/CMakeLists.txt
+++ b/src/support/tests/CMakeLists.txt
@@ -15,7 +15,7 @@ macro(sources _program)
 	add_executable(${_program} ${_tmplist})
 	target_link_libraries(${_program} support
 		${Lyx_Boost_Libraries}
-		${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QtCore5CompatLibrary}
+		${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}
 		${ZLIB_LIBRARY} ${ICONV_LIBRARY})
 	lyx_target_link_libraries(${_program} Magic)
 	if(CYGWIN)
diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index f3bfc52..be219b8 100644
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -48,7 +48,6 @@ target_link_libraries(${_tex2lyx}
 	${Lyx_Boost_Libraries}
 	${QT_QTCORE_LIBRARY}
 	${QT_QTGUI_LIBRARY}
-	${QtCore5CompatLibrary}
 	${ICONV_LIBRARY})
 
 qt_use_modules(${_tex2lyx} ${QtCore5CompatModule})


More information about the lyx-cvs mailing list