[LyX/master] CMake for Windows: remove the remaining lines for Qt 4.

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


commit 40edcfe2f130a9fcd584d4b24a4ed65e25176220
Author: Thibaut Cuvelier <tcuvelier at lyx.org>
Date:   Thu Dec 15 00:53:40 2022 +0100

    CMake for Windows: remove the remaining lines for Qt 4.
---
 development/cmake/modules/LyXPaths.cmake |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/development/cmake/modules/LyXPaths.cmake b/development/cmake/modules/LyXPaths.cmake
index c0a0c84..c0d7a18 100644
--- a/development/cmake/modules/LyXPaths.cmake
+++ b/development/cmake/modules/LyXPaths.cmake
@@ -29,17 +29,7 @@ if(NOT WIN32)
 	set(_prog_path ~/bin)
 else()
 	if(WINDEPS)
-		FIND_PROGRAM(LYX_QMAKE NAMES qmake)
-		if(NOT LYX_QMAKE)
-			message("------ qmake not found. Add YOUR_PATH\\lyx-windows-deps-msvc-qt4\\qt-4\\bin")
-			message("------ to PATH: set PATH=%PATH%;YOUR_PATH\\lyx-windows-deps-msvc-qt4\\qt-4\\bin")
-			message(FATAL_ERROR "Exit.")
-		else()
-			GET_FILENAME_COMPONENT(LYX_QMAKE_PATH ${LYX_QMAKE} PATH)
-			set(WINDEPSDIR "${LYX_QMAKE_PATH}/../..")
-		endif()
-
-		set(GNUWIN32_DIR ${WINDEPSDIR})
+		set(GNUWIN32_DIR "${LYX_QMAKE_PATH}/../..")
 	endif()
 
 	find_package(GNUWIN32 REQUIRED)


More information about the lyx-cvs mailing list