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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 848160a3f1..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)
 
@@ -613,7 +621,7 @@ set(Spelling_FOUND OFF)
 set(Include_used_spellchecker)   # String will be inserted into config.h
 
 if(LYX_3RDPARTY_BUILD)
-    add_subdirectory(src/3rdparty/hunspell)
+    add_subdirectory(3rdparty/hunspell)
     add_definitions(-DHUNSPELL_STATIC)
     set(HUNSPELL_FOUND ON)
     message(STATUS "  * Hunspell:")
@@ -640,15 +648,18 @@ foreach(_spell "ASPELL" "Enchant" "Hunspell")
   endif()
 endforeach()
 
+if(GNUWIN32_DIR)
+	list(APPEND CMAKE_PROGRAM_PATH "${GNUWIN32_DIR}/Python" )
+endif()
 
 find_package(PythonInterp 2.7 QUIET)
 if(PYTHONINTERP_FOUND)
-  if(PYTHON_VERSION_STRING VERSION_GREATER 2.8)
-    unset(PYTHONINTERP_FOUND)
-  endif()
+	if(PYTHON_VERSION_STRING VERSION_GREATER 2.8)
+	unset(PYTHONINTERP_FOUND)
+	endif()
 endif()
 
-if (NOT PYTHONINTERP_FOUND)
+if(NOT PYTHONINTERP_FOUND)
   unset(PYTHON_EXECUTABLE CACHE)
   unset(PYTHON_VERSION_MAJOR)
   unset(PYTHON_VERSION_MINOR)
@@ -676,15 +687,14 @@ endif()
 if(UNIX)
     find_package(ICONV REQUIRED)
     find_package(ZLIB REQUIRED)
+else()
+    if(LYX_3RDPARTY_BUILD)
+	add_subdirectory(3rdparty/libiconv)
+	set(HAVE_ICONV_CONST 1)
+	add_subdirectory(3rdparty/zlib)
+    endif()
 endif()
 
-if(LYX_3RDPARTY_BUILD)
-    add_subdirectory(src/3rdparty/libiconv)
-    set(HAVE_ICONV_CONST 1)
-    add_subdirectory(src/3rdparty/zlib)
-endif()
-
-
 if(LYX_EXTERNAL_BOOST)
 	message(STATUS "Searching for boost")
 	if(LYX_USE_STD_REGEX)
@@ -714,8 +724,8 @@ else()
 	endif()
 	add_definitions(-DBOOST_USER_CONFIG="<config.h>")
 	add_definitions(-DBOOST_SIGNALS_NO_DEPRECATION_WARNING=1)
-	include_directories(${TOP_SRC_DIR}/boost)
-	add_subdirectory(boost "${TOP_BINARY_DIR}/boost")
+	include_directories(${TOP_SRC_DIR}/3rdparty/boost)
+	add_subdirectory(3rdparty/boost "${TOP_BINARY_DIR}/3rdparty/boost")
 endif()