Fix bug #11716

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4e278908412406ba14faee3417a2613f7496dfc..fbcc460de7d4dd0dc40047dbd3444d7a44f1fcdc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,18 +81,6 @@ if(NOT help AND NOT HELP)
       message(FATAL_ERROR "Exiting")
     endif()
   endif()
-  # Enable LTO if supported
-  if (POLICY CMP0069)
-    cmake_policy(SET CMP0069 NEW)
-    include(CheckIPOSupported)
-    check_ipo_supported(RESULT result OUTPUT reason LANGUAGES CXX)
-    if(result)
-      message(STATUS "Setting IPO True")
-      set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
-    else()
-      message(STATUS "Not setting IPO , result = ${result}, reason = ${reason}")
-    endif()
-  endif()
 endif()
 
 if(UNIX)
@@ -154,6 +142,7 @@ LYX_OPTION(ENABLE_KEYTESTS  "Enable for keytests" OFF ALL)
 LYX_OPTION(ASAN             "Use address sanitizer" OFF ALL)
 LYX_COMBO(USE_FILEDIALOG    "Use native or QT file dialog" QT NATIVE)
 LYX_COMBO(USE_QT            "Use Qt version as frontend" AUTO QT4 QT5)
+LYX_COMBO(USE_IPO           "Interprocedural optimization" OFF AUTO ON)
 #LYX_OPTION(3RDPARTY_BUILD   "Build 3rdparty libs" OFF ALL)
 LYX_OPTION(DISABLE_CALLSTACK_PRINTING "do not print a callstack when crashing" OFF ALL)
 LYX_OPTION(EXTERNAL_Z       "OFF := Build 3rdparty lib zlib" ON ALL)
@@ -253,8 +242,6 @@ if(LYX_DEPENDENCIES_DOWNLOAD)
        endforeach()
 endif()
 
-
-
 message(STATUS)
 
 set(EXECUTABLE_OUTPUT_PATH  ${TOP_BINARY_DIR}/bin)
@@ -264,6 +251,24 @@ else()
        set(LIBRARY_OUTPUT_PATH  ${TOP_BINARY_DIR}/lib)
 endif()
 
+set(LYX_IPO_SUPPORTED OFF)
+if (POLICY CMP0069)
+  cmake_policy(SET CMP0069 NEW)
+  if(LYX_USE_IPO MATCHES "AUTO")
+    # Enable LTO if supported and not debugging
+    if (NOT LYX_DEBUG)
+      include(CheckIPOSupported)
+      check_ipo_supported(RESULT LYX_IPO_SUPPORTED)
+    endif()
+  else()
+    set(LYX_IPO_SUPPORTED ${LYX_USE_IPO})
+  endif()
+endif()
+if (LYX_IPO_SUPPORTED)
+  set(LYX_USE_IPO "ON" CACHE STRING "Use interprocedural optimization" FORCE)
+else()
+  set(LYX_USE_IPO "OFF" CACHE STRING "Use interprocedural optimization" FORCE)
+endif()
 
 # Set to some meaningful default
 find_package(CXX11Compiler)
@@ -795,17 +800,29 @@ unset(LYX_PYTHON_EXECUTABLE CACHE)
 unset(PYTHON_VERSION_MAJOR)
 unset(PYTHON_VERSION_MINOR)
 unset(PYTHON_VERSION_STRING)
-find_package(PythonInterp 3.5 QUIET)
-if(NOT PYTHONINTERP_FOUND)
-  unset(PYTHON_EXECUTABLE CACHE)
-  find_package(PythonInterp 2.0 REQUIRED)
-  if(NOT PYTHON_VERSION_STRING VERSION_LESS 2.8)
-    message(FATAL_ERROR "Python interpreter found, but is not suitable")
+if (CMAKE_VERSION VERSION_LESS "3.13")
+  find_package(PythonInterp 3.5 QUIET)
+  if(NOT PYTHONINTERP_FOUND)
+    find_package(PythonInterp 2.0 REQUIRED)
+    if(NOT PYTHON_VERSION_STRING VERSION_LESS 2.8)
+      message(FATAL_ERROR "Python interpreter found, but is not suitable")
+    endif()
+  endif()
+  set(LYX_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
+else()
+  find_package(Python3 3.5 QUIET)
+  if(NOT Python3_Interpreter_FOUND)
+    unset(PYTHON_EXECUTABLE CACHE)
+    find_package(Python2 2.0 REQUIRED)
+    if(NOT Python2_VERSION VERSION_LESS 2.8)
+      message(FATAL_ERROR "Python interpreter found, but is not suitable")
+    endif()
+    set(LYX_PYTHON_EXECUTABLE ${Python2_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
+  else()
+    set(LYX_PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
   endif()
 endif()
 
-set(LYX_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
-
 if(LYX_NLS)
        find_package(LyXGettext)
        if(LYX_PYTHON_EXECUTABLE AND GETTEXT_FOUND)