X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=4a121f4fcba917d1ff00ed35929732d20d3e265a;hb=c9f7ce0a7a6d48b9b60af92828654aa7547286b4;hp=39880f24ef63f35da39e8fcf29e4d7167fdd5a89;hpb=6e3a4ecfe78c5221e0d819c22afb69280c55c978;p=lyx.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39880f24ef..4a121f4fcb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -288,6 +288,10 @@ 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 CACHE BOOL "Build 3rdparty libraries" FORCE)
+	endif()
 	set(USE_WINDOWS_PACKAGING ON)
 elseif(APPLE)
 	set(USE_MACOSX_PACKAGING ON)
@@ -440,9 +444,9 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 			set(CMAKE_INSTALL_PREFIX "/usr/local/${LYX_PROJECT}" CACHE PATH "LyX default install prefix" FORCE)
 		endif()
 	endif()
-	if(WIN32)
-		set(CMAKE_INSTALL_PREFIX LYX_INSTALLED CACHE PATH "LyX default install prefix" FORCE)
-	endif()
+endif()
+if(WIN32)
+	set(CMAKE_INSTALL_PREFIX LYX_INSTALLED CACHE PATH "LyX default install prefix" FORCE)
 endif()
 if(IS_ABSOLUTE)
 	set(CMAKE_INSTALL_PREFIX_ABSOLUTE ${CMAKE_INSTALL_PREFIX})
@@ -468,7 +472,11 @@ set(LYX_ABS_TOP_SRCDIR "${TOP_SRC_DIR}")
 if(LYX_BUNDLE AND APPLE)
 	set(LYX_MAN_DIR "${LYX_DATA_SUBDIR}" CACHE STRING "Install location for man pages.")
 else()
-	set(LYX_MAN_DIR "/usr/local/man/man1" CACHE STRING "Install location for man pages.")
+	if(WIN32)
+		set(LYX_MAN_DIR "${CMAKE_BINARY_DIR}/usr/local/man/man1" CACHE STRING "Install location for man pages.")
+	else()
+		set(LYX_MAN_DIR "/usr/local/man/man1" CACHE STRING "Install location for man pages.")
+	endif()
 endif()
 mark_as_advanced(LYX_MAN_DIR)
 
@@ -640,25 +648,27 @@ foreach(_spell "ASPELL" "Enchant" "Hunspell")
   endif()
 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()
+if(GNUWIN32_DIR)
+	list(APPEND CMAKE_PROGRAM_PATH "${GNUWIN32_DIR}/Python" )
+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)
+find_package(PythonInterp 2.7 QUIET)
+if(PYTHONINTERP_FOUND)
+	if(PYTHON_VERSION_STRING VERSION_GREATER 2.8)
+	unset(PYTHONINTERP_FOUND)
 	endif()
+endif()
 
-	set(LYX_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
+if(NOT PYTHONINTERP_FOUND)
+  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)
 	find_package(LyXGettext)
 	if(LYX_PYTHON_EXECUTABLE AND GETTEXT_FOUND)