From: Peter Kümmel Date: Wed, 20 Jan 2016 18:23:10 +0000 (+0100) Subject: msvc: always build 3rdparty libs X-Git-Tag: 2.2.0beta1~124 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=6dcecd91995b0c0e7ad9c5dfaf3e5ff6e9abd6d7;hp=76eebf57071b977cbc9c8280f28fadc2206d18ff;p=features.git msvc: always build 3rdparty libs --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 39880f24ef..2776d9dc09 100644 --- 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)