Small clanup (just move functions around)

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c53bc590a743c46ba25490127f40c4c4cfcbc160..4e64a013571066c2ff326be905e3830b6b270fae 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)
@@ -129,15 +129,15 @@ endif()
 
 # Check option dependencies
 
-if(LYX_CPACK)
-       set(LYX_INSTALL ON)
-endif()
-
 if(LYX_DMG)
        set(LYX_BUNDLE ON)
        set(LYX_CPACK ON)
 endif()
 
+if(LYX_CPACK)
+       set(LYX_INSTALL ON)
+endif()
+
 if(LYX_INSTALL)
        set(LYX_NLS ON)
        if (WIN32)
@@ -149,7 +149,9 @@ if(LYX_INSTALL)
                set(LYX_CONSOLE OFF)
        endif()
        set(LYX_PACKAGE_SUFFIX ON)
-       set(LYX_RELEASE ON)
+       if(NOT LYX_DEBUG)
+               set(LYX_RELEASE ON)
+       endif()
        set(LYX_PROFILE OFF)
 endif()
 
@@ -237,12 +239,16 @@ else()
        set(USE_POSIX_PACKAGING ON)
 endif()
 
-macro(setstripped _varname _value)
-       string(STRIP ${_value} _v)
-       if(USE_POSIX_PACKAGING)
-               string(TOLOWER ${_v} ${_varname})
+macro(setstripped _varname)
+       if(${ARGC} GREATER 1)
+               string(STRIP "${ARGV1}" _v)
+               if(USE_POSIX_PACKAGING)
+                       string(TOLOWER ${_v} ${_varname})
+               else()
+                       set(${_varname} ${_v})
+               endif()
        else()
-               set(${_varname} ${_v})
+               set(${_varname})
        endif()
 endmacro(setstripped)
 
@@ -448,7 +454,7 @@ if(NOT MSVC)
                set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCPP_CONCEPT_CHECKS")
        endif()
        set(CMAKE_CXX_FLAGS       "${LYX_CXX_FLAGS} -fno-strict-aliasing " CACHE TYPE STRING FORCE)
-       set(CMAKE_CXX_FLAGS_DEBUG "${LYX_CXX_FLAGS} -fno-strict-aliasing -O0 -g -D_DEBUG" CACHE TYPE STRING FORCE)
+       set(CMAKE_CXX_FLAGS_DEBUG "${LYX_CXX_FLAGS} -fno-strict-aliasing -O0 -g3 -D_DEBUG" CACHE TYPE STRING FORCE)
        if(MINGW)
                set(CMAKE_CXX_FLAGS_RELEASE "${LYX_CXX_FLAGS} -O2 -DNDEBUG" CACHE TYPE STRING FORCE)
        else()
@@ -456,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)