Improve structure of updateMacros

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62eff71df3ca199f044f646bba2ec1a7e1deccc1..5d97200ba315203beed328ae3f83148b6b65287b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,12 +2,13 @@
 # Licence details can be found in the file COPYING.
 #
 # Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
-# Copyright (c) 2008-2011 Kornel Benko, <Kornel.Benko@berlin.de>
+# Copyright (c) 2008-2020 Kornel Benko, <Kornel.Benko@berlin.de>
 
 cmake_minimum_required(VERSION 3.1.0)
 
-set(LYX_PROJECT LyX)
+set(GNUWIN32_DIR D:/LyX/lyx-unstable/lyx-windows-deps-msvc2017)
 
+set(LYX_PROJECT LyX)
 # Instruct cmake to not use gnu extensions,
 # this prevents the mix of '-std=c++*' and '-std=gnu++*' flags
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -51,6 +52,9 @@ if(COMMAND cmake_policy)
        if(POLICY CMP0075)
                cmake_policy(SET CMP0075 NEW)
        endif()
+       if(POLICY CMP0077)
+               cmake_policy(SET CMP0077 NEW)
+       endif()
 endif()
 
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
@@ -255,6 +259,8 @@ if(help OR HELP)
        message(STATUS)
        LYX_OPTION_LIST_ALL(help)
        message(STATUS)
+       unset(help CACHE)
+       unset(HELP CACHE)
        RETURN()
 endif()
 
@@ -687,15 +693,22 @@ else()
        if(NOT LYX_QUIET)
                set(CMAKE_VERBOSE_MAKEFILE ON)
        endif()
-       set(LYX_CXX_FLAGS "-Wall -Wunused-parameter ${LYX_GCC11_MODE}${LYX_CXX_FLAGS}")
-       if(LYX_GCC11_MODE MATCHES "\\+\\+(14|11|98)")
+       if(LYX_GCC11_MODE MATCHES "\\+\\+([0-9][0-9])")
          # Thanks to Brad King <brad.king@kitware.com>
          # for the pointer to https://cmake.org/cmake/help/v3.6/variable/CMAKE_CXX_STANDARD.html
          # This allows us to use QT5.7 with recent g++ (version >= 4.9) compilers
          # and still use our own c++ extension tests
-         set(CMAKE_CXX_STANDARD ${CMAKE_MATCH_1})
-         message(STATUS "CMAKE_CXX_STANDARD set to ${CMAKE_CXX_STANDARD}")
+         set(std_num ${CMAKE_MATCH_1})
+         set(CMAKE_CXX_STANDARD ${std_num})
+       else()
+         message(STATUS "Setting CMAKE_CXX_STANDARD 11 as fallback")
+         set(CMAKE_CXX_STANDARD 11)
+         set(LYX_GCC11_MODE "--std=c++11")
        endif()
+       # The following setting with LYX_GCC11_MODE is needed because cmake does not honor
+       # CMAKE_CXX_STANDARD while performing tests like
+       # check_cxx_source_compiles("..." HAVE_DEF_MAKE_UNIQUE)
+       set(LYX_CXX_FLAGS "-Wall -Wunused-parameter ${LYX_GCC11_MODE}${LYX_CXX_FLAGS}")
        if(LYX_STDLIB_DEBUG)
          set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
         else()
@@ -918,6 +931,8 @@ if(LYX_NLS)
 endif()
 
 if(LYX_EXTERNAL_ICONV)
+  # Possible remnants of previous run without external iconv
+  file(REMOVE_RECURSE "${CMAKE_BINARY_DIR}/libiconv" "${CMAKE_BINARY_DIR}/3rdparty/libiconv")
   find_package(ICONV REQUIRED)
 else()
   add_subdirectory(3rdparty/libiconv)
@@ -1072,9 +1087,9 @@ if(MSVC)
                # add here warnings which should be disabled /wdXXXX
                set(MSVC_W_DISABLE "/wd4288 /wd4355 /wd4800 /wd4996 /wd4311 /wd4312 /wd4505 /wd4267 /wd4512 /wd4245 /wd4127 /wd4180 /wd4231")
 
-               set(CMAKE_CXX_FLAGS_DEBUG      "${CMAKE_CXX_FLAGS_DEBUG} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
-               set(CMAKE_CXX_FLAGS_RELEASE    "${CMAKE_CXX_FLAGS_RELEASE} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
-               set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
+               set(CMAKE_CXX_FLAGS_DEBUG      "${CMAKE_CXX_FLAGS_DEBUG} /W4 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
+               set(CMAKE_CXX_FLAGS_RELEASE    "${CMAKE_CXX_FLAGS_RELEASE} /W4 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
+               set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /W4 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
 
        else()
                set(CMAKE_CXX_WARNING_LEVEL 3 CACHE STRING "Warning level" FORCE)