commit 77f4d162a0f64011453fd6fd58f66e4947cf9739
Author: Eugene Chornyi <[email protected]>
Date: Wed Nov 18 19:17:44 2020 +0100
CMake fix but where Perl not found on Windows
---
CMakeLists.txt | 9 ++++-----
development/cmake/modules/LyXPaths.cmake | 5 ++---
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9bde3e..e2e1e1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,6 @@
cmake_minimum_required(VERSION 3.1.0)
-set(GNUWIN32_DIR D:/LyX/lyx-unstable/lyx-windows-deps-msvc2017)
-
set(LYX_PROJECT LyX)
# Instruct cmake to not use gnu extensions,
# this prevents the mix of '-std=c++*' and '-std=gnu++*' flags
@@ -106,9 +104,6 @@ endif()
include(LyXMacros)
include(LyXDestinations)
-# Try to get some informations from configure.ac
-include(LyXPaths)
-
# Value of USE_POSIX_PACKAGING is needed in determineversionandbuildtype()
if(WIN32)
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(COCOA "Use Cocoa on Mac" OFF MAC)
+# Try to get some informations from configure.ac
+include(LyXPaths)
+
if(help OR HELP)
message(STATUS)
@@ -884,6 +882,7 @@ endforeach()
if(GNUWIN32_DIR)
list(APPEND CMAKE_PROGRAM_PATH "${GNUWIN32_DIR}/Python" )
+ list(APPEND CMAKE_PROGRAM_PATH "${GNUWIN32_DIR}/Perl/bin" )
endif()
# Search for python default version first
diff --git a/development/cmake/modules/LyXPaths.cmake
b/development/cmake/modules/LyXPaths.cmake
index a5e3c87..aca4427 100644
--- a/development/cmake/modules/LyXPaths.cmake
+++ b/development/cmake/modules/LyXPaths.cmake
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, Peter K�mmel, <[email protected]>
+# Copyright (c) 2006, Peter Kümmel, <[email protected]>
#
# Redistribution and use in source and binary forms, with or without
# 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)
endif()
+find_package(GNUWIN32 REQUIRED)
if(LYX_3RDPARTY_BUILD)
- find_package(GNUWIN32)
file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _prog_path)
else()
- find_package(GNUWIN32 REQUIRED)
file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _prog_path)
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
