msvc: always build 3rdparty libs

[features.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e10ab3d8326dcaad151600c172fb70f50d902f82..2776d9dc09f521b42cf5f58dbf496cddde37422e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,6 +157,7 @@ LYX_OPTION(VLD                   "Use VLD with MSVC" OFF MSVC)
 LYX_OPTION(WALL                  "Enable all warnings" OFF MSVC)
 LYX_OPTION(CONFIGURE_CHECKS      "Also run configure checks for MSVC" OFF MSVC)
 LYX_OPTION(DEPENDENCIES_DOWNLOAD "Download dependencies for MSVC 10" OFF MSVC)
+LYX_OPTION(3RDPARTY_BUILD        "Build 3rdparty libraries " OFF MSVC)
 
 # APPLE specific
 LYX_OPTION(DMG                   "Build as Mac bundle, needed for .dmg  (experimental) " OFF MAC)
@@ -288,6 +289,9 @@ include(LyXPaths)
 file(STRINGS "${TOP_SRC_DIR}/configure.ac" _config_lines)
 
 if(WIN32)
+       if(MSVC)
+               set(LYX_3RDPARTY_BUILD ON)
+       endif()
        set(USE_WINDOWS_PACKAGING ON)
 elseif(APPLE)
        set(USE_MACOSX_PACKAGING ON)
@@ -640,24 +644,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 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)
+       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)