Update a format

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 815079f5b43545eeb71249b31d11d87723b1b0bf..a87b049357d195c3f2317321b4fe25981567aa25 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,9 @@ if(COMMAND cmake_policy)
        cmake_policy(SET CMP0005 OLD)
        # Installing MACOSX_BUNDLE targets requires a BUNDLE DESTINATION
        cmake_policy(SET CMP0006 NEW)
+       if(POLICY CMP0020)
+               cmake_policy(SET CMP0020 OLD)
+       endif()
        if(POLICY CMP0028)
                cmake_policy(SET CMP0028 OLD)
        endif()
@@ -542,9 +545,9 @@ if(LYX_CXX_FLAGS_EXTRA)
 endif()
 
 if(LYX_XMINGW)
-    set(QT_MINGW_DIR ${LYX_QT4} CACHE PATH "Qt for Mingw" FORCE)
-    list(APPEND CMAKE_FIND_ROOT_PATH ${QT_MINGW_DIR} ${GNUWIN32_DIR})
+       list(APPEND CMAKE_FIND_ROOT_PATH ${GNUWIN32_DIR})
 endif()
+
 if(LYX_USE_QT MATCHES "QT5")
        find_package(Qt5Core REQUIRED)
        if (Qt5Core_FOUND)
@@ -567,6 +570,10 @@ if(LYX_USE_QT MATCHES "QT5")
                message(STATUS "Found Qt-Version ${QTVERSION}")
        endif()
 elseif(LYX_USE_QT MATCHES "QT4")
+       if(LYX_XMINGW)
+               set(QT_MINGW_DIR ${LYX_QT4} CACHE PATH "Qt for Mingw" FORCE)
+               list(APPEND CMAKE_FIND_ROOT_PATH ${QT_MINGW_DIR} ${GNUWIN32_DIR})
+       endif()
        find_package(Qt4 "4.5.0" REQUIRED)
        macro (qt_use_modules)
        endmacro()