From 64aadeaf5fd10969d48f2f35949e143ea988e61a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Sat, 23 Dec 2006 21:47:06 +0000 Subject: [PATCH] also work with Joost's windows file bundle (qmake gives the non-portabale path of Joost's Qt installation) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16388 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/modules/LyXPaths.cmake | 28 ++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/development/cmake/modules/LyXPaths.cmake b/development/cmake/modules/LyXPaths.cmake index d9ae43dd39..8b23d81e71 100644 --- a/development/cmake/modules/LyXPaths.cmake +++ b/development/cmake/modules/LyXPaths.cmake @@ -27,6 +27,34 @@ if(WIN32) + +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(NOT LYX_QMAKE) + GET_FILENAME_COMPONENT(LYX_QMAKE_PATH ${LYX_QMAKE} PATH) + set(WINDEPSDIR "${LYX_QMAKE_PATH}/../..") + endif(NOT LYX_QMAKE) + + 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 TYPE STRING FORCE) + set(QT_LIBRARY_DIR "${WINDEPSDIR}/qt-4/lib" CACHE TYPE STRING FORCE) + set(QT_BINARY_DIR "${WINDEPSDIR}/qt-4/bin" CACHE TYPE STRING FORCE) + set(QT_MKSPECS_DIR "${WINDEPSDIR}/qt-4/mkspecs" CACHE TYPE STRING FORCE) + set(QT_PLUGINS_DIR "${WINDEPSDIR}/qt-4/plugins" CACHE TYPE STRING FORCE) + set(QT_MOC_EXECUTABLE "${WINDEPSDIR}/qt-4/bin/moc.exe" CACHE TYPE STRING FORCE) + set(QT_UIC_EXECUTABLE "${WINDEPSDIR}/qt-4/bin/uic.exe" CACHE TYPE STRING FORCE) + set(QT_RCC_EXECUTABLE "${WINDEPSDIR}/qt-4/bin/rcc.exe" CACHE TYPE STRING FORCE) + +endif(WINDEPS) + find_package(GNUWIN32 REQUIRED) file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _prog_path) -- 2.39.2