X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=39880f24ef63f35da39e8fcf29e4d7167fdd5a89;hb=86d2a203b060481a663356427e56a1c229f3fd6c;hp=8ad97de7ee056852e4212a5e89bf8f74b5b32d9f;hpb=a3646a42a9853b7737ff0badc868410b50c0c958;p=lyx.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ad97de7ee..39880f24ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -640,24 +640,25 @@ 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()
 
-find_package(PythonInterp 2.7 QUIET)
-if(PYTHONINTERP_FOUND)
-  if(PYTHON_VERSION_STRING VERSION_GREATER 2.8)
-    unset(PYTHONINTERP_FOUND)
-  endif()
-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)
+	endif()
 
-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)
+	set(LYX_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
 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)
@@ -676,15 +677,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(3rdparty/libiconv)
-    set(HAVE_ICONV_CONST 1)
-    add_subdirectory(3rdparty/zlib)
-endif()
-
-
 if(LYX_EXTERNAL_BOOST)
 	message(STATUS "Searching for boost")
 	if(LYX_USE_STD_REGEX)
@@ -714,8 +714,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()