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

CMake fix but where Perl not found on Windows

Browse Source
This commit is contained in:
Eugene Chornyi 2020-11-18 19:17:44 +01:00
parent 0b9c27222a
commit 77f4d162a0
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -6,8 +6,6 @@
cmake_minimum_required(VERSION 3.1.0) cmake_minimum_required(VERSION 3.1.0)
set(GNUWIN32_DIR D:/LyX/lyx-unstable/lyx-windows-deps-msvc2017)
set(LYX_PROJECT LyX) set(LYX_PROJECT LyX)
# Instruct cmake to not use gnu extensions, # Instruct cmake to not use gnu extensions,
# this prevents the mix of '-std=c++*' and '-std=gnu++*' flags # this prevents the mix of '-std=c++*' and '-std=gnu++*' flags
@ -106,9 +104,6 @@ endif()
include(LyXMacros) include(LyXMacros)
include(LyXDestinations) include(LyXDestinations)
# Try to get some informations from configure.ac
include(LyXPaths)
# Value of USE_POSIX_PACKAGING is needed in determineversionandbuildtype() # Value of USE_POSIX_PACKAGING is needed in determineversionandbuildtype()
if(WIN32) if(WIN32)
set(CMAKE_PREFIX_PATH Specify-path-to-Qt CACHE PATH "Used Qt version") set(CMAKE_PREFIX_PATH Specify-path-to-Qt CACHE PATH "Used Qt version")
@ -252,6 +247,9 @@ LYX_OPTION(DEPENDENCIES_DOWNLOAD "Download dependencies for MSVC 10" OFF MSVC)
LYX_OPTION(DMG "Build as Mac bundle, needed for .dmg (experimental) " OFF MAC) LYX_OPTION(DMG "Build as Mac bundle, needed for .dmg (experimental) " OFF MAC)
LYX_OPTION(COCOA "Use Cocoa on Mac" OFF MAC) LYX_OPTION(COCOA "Use Cocoa on Mac" OFF MAC)
# Try to get some informations from configure.ac
include(LyXPaths)
if(help OR HELP) if(help OR HELP)
message(STATUS) message(STATUS)
@ -884,6 +882,7 @@ endforeach()
if(GNUWIN32_DIR) if(GNUWIN32_DIR)
list(APPEND CMAKE_PROGRAM_PATH "${GNUWIN32_DIR}/Python" ) list(APPEND CMAKE_PROGRAM_PATH "${GNUWIN32_DIR}/Python" )
list(APPEND CMAKE_PROGRAM_PATH "${GNUWIN32_DIR}/Perl/bin" )
endif() endif()
# Search for python default version first # Search for python default version first

5
development/cmake/modules/LyXPaths.cmake
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2006, Peter Kümmel, <syntheticpp@gmx.net> # Copyright (c) 2006, Peter Kümmel, <syntheticpp@gmx.net>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
@ -54,11 +54,10 @@ if(WINDEPS)
set(QT_RCC_EXECUTABLE "${WINDEPSDIR}/qt-4/bin/rcc.exe" CACHE STRING "Qt4 rcc executable" FORCE) set(QT_RCC_EXECUTABLE "${WINDEPSDIR}/qt-4/bin/rcc.exe" CACHE STRING "Qt4 rcc executable" FORCE)
endif() endif()
find_package(GNUWIN32 REQUIRED)
if(LYX_3RDPARTY_BUILD) if(LYX_3RDPARTY_BUILD)
find_package(GNUWIN32)
file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _prog_path) file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _prog_path)
else() else()
find_package(GNUWIN32 REQUIRED)
file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _prog_path) file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _prog_path)