commit 03e7e5cfb3e78135985a6a8184cf0b2eb257214e
Author: Peter Kümmel <kuem...@lyx.org>
Date: Fri Jan 22 12:12:53 2016 +0100
improve configuration with cmake-gui
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a28a190..4a121f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,7 +157,6 @@ LYX_OPTION(VLD "Use VLD with MSVC" OFF
MSVC)
LYX_OPTION(WALL "Enable all warnings" OFF MSVC)
LYX_OPTION(CONFIGURE_CHECKS "Also run configure checks for MSVC" OFF MSVC)
LYX_OPTION(DEPENDENCIES_DOWNLOAD "Download dependencies for MSVC 10" OFF MSVC)
-LYX_OPTION(3RDPARTY_BUILD "Build 3rdparty libraries " OFF MSVC)
# APPLE specific
LYX_OPTION(DMG "Build as Mac bundle, needed for .dmg
(experimental) " OFF MAC)
@@ -289,8 +288,9 @@ include(LyXPaths)
file(STRINGS "${TOP_SRC_DIR}/configure.ac" _config_lines)
if(WIN32)
+ set(CMAKE_PREFIX_PATH Specify-path-to-Qt CACHE PATH "Used Qt version")
if(MSVC)
- set(LYX_3RDPARTY_BUILD ON)
+ set(LYX_3RDPARTY_BUILD ON CACHE BOOL "Build 3rdparty libraries"
FORCE)
endif()
set(USE_WINDOWS_PACKAGING ON)
elseif(APPLE)
@@ -444,9 +444,9 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX "/usr/local/${LYX_PROJECT}"
CACHE PATH "LyX default install prefix" FORCE)
endif()
endif()
- if(WIN32)
- set(CMAKE_INSTALL_PREFIX LYX_INSTALLED CACHE PATH "LyX default
install prefix" FORCE)
- endif()
+endif()
+if(WIN32)
+ set(CMAKE_INSTALL_PREFIX LYX_INSTALLED CACHE PATH "LyX default install
prefix" FORCE)
endif()
if(IS_ABSOLUTE)
set(CMAKE_INSTALL_PREFIX_ABSOLUTE ${CMAKE_INSTALL_PREFIX})
@@ -648,25 +648,27 @@ foreach(_spell "ASPELL" "Enchant" "Hunspell")
endif()
endforeach()
-if(NOT LYX_PYTHON_EXECUTABLE)
- find_package(PythonInterp 2.7 QUIET)
- if(PYTHONINTERP_FOUND)
- if(PYTHON_VERSION_STRING VERSION_GREATER 2.8)
- unset(PYTHONINTERP_FOUND)
- endif()
- endif()
+if(GNUWIN32_DIR)
+ list(APPEND CMAKE_PROGRAM_PATH "${GNUWIN32_DIR}/Python" )
+endif()
- if(NOT PYTHONINTERP_FOUND AND NOT GNUWIN32_DIR)
- unset(PYTHON_EXECUTABLE CACHE)
- unset(PYTHON_VERSION_MAJOR)
- unset(PYTHON_VERSION_MINOR)
- unset(PYTHON_VERSION_STRING)
- find_package(PythonInterp 3.3 REQUIRED)
+find_package(PythonInterp 2.7 QUIET)
+if(PYTHONINTERP_FOUND)
+ if(PYTHON_VERSION_STRING VERSION_GREATER 2.8)
+ unset(PYTHONINTERP_FOUND)
endif()
+endif()
- set(LYX_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "Python
to be used by LyX")
+if(NOT PYTHONINTERP_FOUND)
+ unset(PYTHON_EXECUTABLE CACHE)
+ unset(PYTHON_VERSION_MAJOR)
+ unset(PYTHON_VERSION_MINOR)
+ unset(PYTHON_VERSION_STRING)
+ find_package(PythonInterp 3.3 REQUIRED)
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)
