anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve configuration with cmake-gui

Browse Source
This commit is contained in:
Peter Kümmel 2016-01-22 12:12:53 +01:00
parent c0e5bbb600
commit 03e7e5cfb3
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -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,10 +444,10 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX "/usr/local/${LYX_PROJECT}" CACHE PATH "LyX default install prefix" FORCE)
endif()
endif()
endif()
if(WIN32)
set(CMAKE_INSTALL_PREFIX LYX_INSTALLED CACHE PATH "LyX default install prefix" FORCE)
endif()
endif()
if(IS_ABSOLUTE)
set(CMAKE_INSTALL_PREFIX_ABSOLUTE ${CMAKE_INSTALL_PREFIX})
else()
@ -648,7 +648,10 @@ foreach(_spell "ASPELL" "Enchant" "Hunspell")
endif()
endforeach()
if(NOT LYX_PYTHON_EXECUTABLE)
if(GNUWIN32_DIR)
list(APPEND CMAKE_PROGRAM_PATH "${GNUWIN32_DIR}/Python" )
endif()
find_package(PythonInterp 2.7 QUIET)
if(PYTHONINTERP_FOUND)
if(PYTHON_VERSION_STRING VERSION_GREATER 2.8)
@ -656,7 +659,7 @@ if(NOT LYX_PYTHON_EXECUTABLE)
endif()
endif()
if(NOT PYTHONINTERP_FOUND AND NOT GNUWIN32_DIR)
if(NOT PYTHONINTERP_FOUND)
unset(PYTHON_EXECUTABLE CACHE)
unset(PYTHON_VERSION_MAJOR)
unset(PYTHON_VERSION_MINOR)
@ -665,7 +668,6 @@ if(NOT LYX_PYTHON_EXECUTABLE)
endif()
set(LYX_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
endif()
if(LYX_NLS)
find_package(LyXGettext)