RJournal.lyx: hardcoded shortcuts -> insets

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b1ac0e525806cc31e976b45299649fef57805c9..8706e154c26269df53063b52c9c5db16b9ceb1a5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,7 +100,7 @@ LYX_OPTION(PROFILE              "Build profile version" OFF GCC)
 LYX_OPTION(EXTERNAL_BOOST       "Use external boost" OFF GCC)
 LYX_OPTION(PROGRAM_SUFFIX       "Append version suffix to binaries" ON GCC)
 LYX_OPTION(DEBUG_GLIBC          "Enable libstdc++ debug mode" OFF GCC)
-LYX_OPTION(DEBUG_GLIBC_PEDANTIC "Enable libstdc++pedantic debug mode" OFF GCC)
+LYX_OPTION(DEBUG_GLIBC_PEDANTIC "Enable libstdc++ pedantic debug mode" OFF GCC)
 LYX_OPTION(STDLIB_DEBUG         "Use debug stdlib" OFF GCC)
 LYX_OPTION(CONCEPT_CHECKS       "Enable concept-checks" OFF GCC)
 LYX_OPTION(PROFILE              "Build with options for gprof" OFF GCC)
@@ -462,8 +462,31 @@ if(NOT MSVC)
        endif()
 endif()
 
+find_package(Qt5Core QUIET)
+if (Qt5Core_FOUND)
+       find_package(Qt5Widgets REQUIRED)
+       set(QTVERSION ${Qt5Core_VERSION})
+       macro (qt_use_modules)
+               qt5_use_modules(${ARGN})
+       endmacro()
+       macro (qt_add_resources)
+               qt5_add_resources(${ARGN})
+       endmacro()
+       macro (qt_wrap_uifiles)
+               qt5_wrap_ui(${ARGN})
+       endmacro()
+else()
+       find_package(Qt4 "4.5.0" REQUIRED)
+       macro (qt_use_modules)
+       endmacro()
+       macro (qt_add_resources)
+               qt4_add_resources(${ARGN})
+       endmacro()
+       macro (qt_wrap_uifiles)
+               qt4_wrap_ui(${ARGN})
+       endmacro()
+endif()
 
-find_package(Qt4 REQUIRED)
 find_package(Magic)
 if(Magic_FOUND)
        set(HAVE_MAGIC_H 1)
@@ -657,9 +680,12 @@ if(MSVC)
                set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
 
        endif()
-       set(CMAKE_CXX_FLAGS_DEBUG      "${CMAKE_CXX_FLAGS_DEBUG} /Zc:wchar_t-")
-       set(CMAKE_CXX_FLAGS_RELEASE    "${CMAKE_CXX_FLAGS_RELEASE} /Zc:wchar_t-")
-       set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /Zc:wchar_t-")
+
+       if (NOT Qt5Core_FOUND)
+               set(CMAKE_CXX_FLAGS_DEBUG      "${CMAKE_CXX_FLAGS_DEBUG} /Zc:wchar_t-")
+               set(CMAKE_CXX_FLAGS_RELEASE    "${CMAKE_CXX_FLAGS_RELEASE} /Zc:wchar_t-")
+               set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /Zc:wchar_t-")
+       endif()
 
        message(STATUS "----- Warning level      : ${CMAKE_CXX_WARNING_LEVEL}  ${WARNING_LEVEL_MESSAGE}")
        message(STATUS "----- Warnings as errors : ${MSVC_W_ERROR}")
@@ -690,6 +716,9 @@ if (CMAKE_GENERATOR MATCHES Xcode)
     MESSAGE(STATUS "---- Using XCode compiler CMAKE_XCODE_ATTRIBUTE_GCC_VERSION=${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION}")
 ENDIF(CMAKE_GENERATOR MATCHES Xcode)
 
+if (WIN32 AND Qt5Core_FOUND)
+       set(Z_PREFIX 1)
+endif()
 
 # compiler tests, config.h generation
 if(MSVC AND NOT LYX_CONFIGURE_CHECKS)