[LyX/master] CMake for Windows: remove many lines hard-coding Qt 4 paths.

Thibaut Cuvelier tcuvelier at lyx.org
Wed Dec 14 22:59:08 UTC 2022


commit 23aab19b59fdd9c6865f40d52ec8fbd8b6e6e592
Author: Thibaut Cuvelier <tcuvelier at lyx.org>
Date:   Thu Dec 15 00:52:58 2022 +0100

    CMake for Windows: remove many lines hard-coding Qt 4 paths.
---
 development/cmake/modules/LyXPaths.cmake |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/development/cmake/modules/LyXPaths.cmake b/development/cmake/modules/LyXPaths.cmake
index 658c206..c0a0c84 100644
--- a/development/cmake/modules/LyXPaths.cmake
+++ b/development/cmake/modules/LyXPaths.cmake
@@ -40,17 +40,6 @@ else()
 		endif()
 
 		set(GNUWIN32_DIR ${WINDEPSDIR})
-
-		# don't stop in FindQt4.cmake because qmake will
-		# report wrong paths
-		set(QT_HEADERS_DIR "${WINDEPSDIR}/qt-4/include" CACHE STRING "Qt4 headers directory" FORCE)
-		set(QT_LIBRARY_DIR "${WINDEPSDIR}/qt-4/lib" CACHE STRING "Qt4 libraries directory" FORCE)
-		set(QT_BINARY_DIR  "${WINDEPSDIR}/qt-4/bin" CACHE STRING "Qt4 binaries directory" FORCE)
-		set(QT_MKSPECS_DIR "${WINDEPSDIR}/qt-4/mkspecs" CACHE STRING "Qt4 mkspecs directory" FORCE)
-		set(QT_PLUGINS_DIR "${WINDEPSDIR}/qt-4/plugins" CACHE STRING "Qt4 plugins directory" FORCE)
-		set(QT_MOC_EXECUTABLE "${WINDEPSDIR}/qt-4/bin/moc.exe" CACHE STRING "Qt4 moc executable" FORCE)
-		set(QT_UIC_EXECUTABLE "${WINDEPSDIR}/qt-4/bin/uic.exe" CACHE STRING "Qt4 uic executable" FORCE)
-		set(QT_RCC_EXECUTABLE "${WINDEPSDIR}/qt-4/bin/rcc.exe" CACHE STRING "Qt4 rcc executable" FORCE)
 	endif()
 
 	find_package(GNUWIN32 REQUIRED)


More information about the lyx-cvs mailing list