cmake_policy(SET CMP0043 NEW)
endif()
cmake_policy(SET CMP0020 NEW)
- cmake_policy(SET CMP0075 OLD)
+ if(POLICY CMP0075)
+ cmake_policy(SET CMP0075 OLD)
+ endif()
endif()
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
endif()
set(LYX_GCC11_MODE)
if(UNIX OR MINGW)
- if (CMAKE_CXX_COMPILER_ID MATCHES "^[cC]lang$")
+ if (CMAKE_CXX_COMPILER_ID MATCHES "^([cC]lang|AppleClang)$")
# ignore the GCC_VERSION for clang
# and use the resulting CXX11_STD_REGEX found in FindCXX11Compiler.cmake
message(STATUS "Using clang")
endif()
set(LYX_GCC11_MODE "${CXX11_FLAG}")
else()
- set(LYX_USE_STD_REGEX 0)
-# if(MSVC10)
-# set(LYX_USE_STD_REGEX 1) #TODO should we use it in ECMAScript mode?
-# endif()
+ if(MSVC_VERSION LESS 1915)
+ set(LYX_USE_STD_REGEX 0)
+ else()
+ set(LYX_USE_STD_REGEX 1)
+ endif()
endif()
set(SYSTEM_DATADIR "${CMAKE_INSTALL_PREFIX}")
endif()
-if(CMAKE_COMPILER_IS_GNUCXX)
- message(STATUS "CMAKE_COMPILER_IS_GNUCXX = ${CMAKE_COMPILER_IS_GNUCXX}")
- set(suffixing ${LYX_PROGRAM_SUFFIX})
-else()
+if(NOT CMAKE_COMPILER_IS_GNUCXX)
# Not a GCC compiler, programs do not have a suffix
set(suffixing ${LYX_PACKAGE_SUFFIX})
+elseif(WIN32 AND MINGW)
+ # We want to use a suffix for the package in this case,
+ # even if not for the program
+ set(suffixing ${LYX_PACKAGE_SUFFIX})
+else()
+ message(STATUS "CMAKE_COMPILER_IS_GNUCXX = ${CMAKE_COMPILER_IS_GNUCXX}")
+ set(suffixing ${LYX_PROGRAM_SUFFIX})
endif()
# The define PACKAGE below allows lyx-executable to find its default configuration files
# get_default_user_support_dir()
# relative_system_support_dir()
# in src/support/Package.cpp
-#
if(suffixing)
set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX})
else()