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

mingw.bat: circumvent critical python detection

Browse Source 
LyX could be build with a double click on mingw.bat.
This commit is contained in:
Peter Kümmel 2016-01-13 15:42:43 +01:00
parent 275d5a66a5
commit 6e3a4ecfe7
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
CMakeLists.txt
View File

@ -640,24 +640,25 @@ foreach(_spell "ASPELL" "Enchant" "Hunspell")
endif() endif()
endforeach() 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()
find_package(PythonInterp 2.7 QUIET) if(NOT PYTHONINTERP_FOUND AND NOT GNUWIN32_DIR)
if(PYTHONINTERP_FOUND) unset(PYTHON_EXECUTABLE CACHE)
if(PYTHON_VERSION_STRING VERSION_GREATER 2.8) unset(PYTHON_VERSION_MAJOR)
unset(PYTHONINTERP_FOUND) unset(PYTHON_VERSION_MINOR)
endif() 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")
endif() 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)
endif()
set(LYX_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
if(LYX_NLS) if(LYX_NLS)
find_package(LyXGettext) find_package(LyXGettext)
if(LYX_PYTHON_EXECUTABLE AND GETTEXT_FOUND) if(LYX_PYTHON_EXECUTABLE AND GETTEXT_FOUND)

20
development/cmake/mingw.bat
View File

@ -1,5 +1,10 @@
REM Run this script via double click.
REM Create a link and add cmd.exe /k in the preferences in front of the mingw.bat call to prevent closing the cmd window.
echo off echo off
REM Install Qt from qt.io
set PATH=C:\Qt\Qt5.5.1\5.5\mingw492_32\bin;%PATH% set PATH=C:\Qt\Qt5.5.1\5.5\mingw492_32\bin;%PATH%
set PATH=C:\Qt\Qt5.5.1\Tools\mingw492_32\bin;%PATH% set PATH=C:\Qt\Qt5.5.1\Tools\mingw492_32\bin;%PATH%
@ -9,20 +14,21 @@ set LYX_BUILD=%LYX_SOURCE%\..\compile-mingw
echo LyX source: %LYX_SOURCE% echo LyX source: %LYX_SOURCE%
echo LyX build : %LYX_BUILD% echo LyX build : %LYX_BUILD%
set GNUWIN32_DIR=%LYX_SOURCE%\..\msvc2010-deps REM Download http://sourceforge.net/projects/lyx/files/Win_installers/Dependencies/lyx20-deps-msvc2010-x86.zip
set PATH="%GNUWIN32_DIR%\deps20\Python";%PATH% REM Extract on the same level as LyX sources
set GNUWIN32_DIR=%LYX_SOURCE%\..\lyx20-deps-msvc2010-x86\deps20
mkdir %LYX_BUILD% mkdir %LYX_BUILD%
rmdir /s/q %LYX_BUILD% rmdir /s/q %LYX_BUILD%
mkdir %LYX_BUILD% mkdir %LYX_BUILD%
cd %LYX_BUILD% cd %LYX_BUILD%
cmake %LYX_SOURCE% -GNinja -DLYX_3RDPARTY_BUILD=ON -DLYX_ENABLE_CXX11=ON -DLYX_USE_QT=QT5 -DLYX_MERGE_REBUILD=1 -DLYX_MERGE_FILES=1 -DLYX_NLS=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF cmake %LYX_SOURCE% -G"MinGW Makefiles" -DLYX_PYTHON_EXECUTABLE=%GNUWIN32_DIR%\Python\python -DLYX_3RDPARTY_BUILD=1 -DLYX_ENABLE_CXX11=ON -DLYX_USE_QT=QT5 -DLYX_MERGE_REBUILD=1 -DLYX_MERGE_FILES=1 -DLYX_NLS=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF
ninja mingw32-make doc
ninja install mingw32-make translations
mingw32-make
cd .. mingw32-make install/strip
goto :eof goto :eof
:eof :eof