[wt] Suppress reliance on boost autolinking

Fixes #558
This commit is contained in:
Robert Schumacher 2017-01-24 14:55:07 -08:00
parent 44810f267d
commit c09e6ff69a
3 changed files with 35 additions and 3 deletions

View File

@ -1,4 +1,4 @@
Source: wt
Version: 3.3.6
Version: 3.3.6-2
Description: Wt is a C++ library for developing web applications
Build-Depends: boost, openssl

View File

@ -0,0 +1,26 @@
diff --git a/cmake/WtFindBoost-cmake.txt b/cmake/WtFindBoost-cmake.txt
index b66741f..377cede 100644
--- a/cmake/WtFindBoost-cmake.txt
+++ b/cmake/WtFindBoost-cmake.txt
@@ -99,7 +99,7 @@ IF (Boost_FOUND)
SET(BOOST_WTHTTP_MT_FOUND TRUE)
SET(BOOST_WTHTTP_FOUND TRUE)
- IF(MSVC)
+ IF(MSVC AND NOT DISABLE_BOOST_AUTOLINK)
# use autolink
SET(BOOST_WT_LIBRARIES "")
SET(BOOST_WTHTTP_LIBRARIES "")
diff --git a/src/wt/Dbo/CMakeLists.txt b/src/wt/Dbo/CMakeLists.txt
index 64d3af2..f9c31e0 100644
--- a/src/wt/Dbo/CMakeLists.txt
+++ b/src/wt/Dbo/CMakeLists.txt
@@ -31,7 +31,7 @@ IF(ENABLE_LIBWTDBO)
StringStream.C
)
- IF(MSVC)
+ IF(MSVC AND NOT DISABLE_BOOST_AUTOLINK)
#win32 links automatically against boost libs; specifying too much causes
#trouble
IF(MULTI_THREADED_BUILD)

View File

@ -8,9 +8,13 @@ vcpkg_download_distfile(ARCHIVE_FILE
)
vcpkg_extract_source_archive(${ARCHIVE_FILE})
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/add-disable-boost-autolink-option.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-DSHARED_LIBS=ON
-DENABLE_SSL=ON
@ -20,6 +24,8 @@ SOURCE_PATH ${SOURCE_PATH}
-DENABLE_MYSQL=OFF
-DENABLE_QT4=OFF
-DBOOST_DYNAMIC=ON
-DDISABLE_BOOST_AUTOLINK=ON
-DENABLE_LIBWTTEST=OFF
)
vcpkg_install_cmake()