Typo

[features.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dcc05da1be3a272a0d16c1b3f4e28719404fce9e..e2e1e1f6688e81d47efc1b29ef055bc11b5a25da 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,37 +6,7 @@
 
 cmake_minimum_required(VERSION 3.1.0)
 
-## set PATH=C:/Strawberry/perl/bin/;%PATH%
-## set PATH=C:\Users\Thibaut\Anaconda3;%PATH%
-## set PATH=C:\Program Files\CMake\bin;%PATH%
-## D:
-## cd LyX\lyx-unstable\cmake-build-debug
-## ctest -j4 -R .*docbook5
-
-set(CMAKE_CXX_STANDARD 17)
-set(GNUWIN32_DIR D:/LyX/lyx-unstable/lyx-windows-deps-msvc2017)
-set(LYX_USE_QT "QT5")
-set(LYX_REQUIRE_SPELLCHECK true)
-set(LYX_ENABLE_EXPORT_TESTS 1)
-
-set(QT_DIR D:/Qt/5.15.0/msvc2019_64)
-set(QT5_DIR D:/Qt/5.15.0/msvc2019_64)
-set(QT_MKSPECS_DIR D:/Qt/5.15.0/msvc2019_64/mkspecs)
-set(Qt5Concurrent_DIR D:/Qt/5.15.0/msvc2019_64/lib/cmake/Qt5Concurrent)
-set(Qt5Core_DIR D:/Qt/5.15.0/msvc2019_64/lib/cmake/Qt5Core)
-set(Qt5Gui_DIR D:/Qt/5.15.0/msvc2019_64/lib/cmake/Qt5Gui)
-set(Qt5Svg_DIR D:/Qt/5.15.0/msvc2019_64/lib/cmake/Qt5Svg)
-set(Qt5Widgets_DIR D:/Qt/5.15.0/msvc2019_64/lib/cmake/Qt5Widgets)
-set(Qt5WinExtras_DIR D:/Qt/5.15.0/msvc2019_64/lib/cmake/Qt5WinExtras)
-
-LIST(PREPEND CMAKE_PROGRAM_PATH  "C:/Strawberry/perl/bin")
-LIST(PREPEND CMAKE_PROGRAM_PATH  "C:/Strawberry/c/bin")
-LIST(PREPEND CMAKE_PROGRAM_PATH  "C:/Users/Thibaut/Anaconda3")
-set(PERL_EXECUTABLE "C:/Strawberry/perl/bin/perl.exe")
-set(JAVA_EXECUTABLE "C:/Program Files/Java/jdk-15/bin/java.exe")
-
 set(LYX_PROJECT LyX)
-
 # Instruct cmake to not use gnu extensions,
 # this prevents the mix of '-std=c++*' and '-std=gnu++*' flags
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -134,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")
@@ -280,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)
@@ -912,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