diff options
| author | flysha <flysha@live.com> | 2017-01-25 10:01:57 +0800 |
|---|---|---|
| committer | flysha <flysha@live.com> | 2017-01-25 10:01:57 +0800 |
| commit | 033c7d0af6a5f5129e73ebb63b1abea0db128da6 (patch) | |
| tree | f0998507be51a02b1b9fa1e4e3836b95fe826ab8 /ports/wt | |
| parent | ce9741f71b079dad944e177daf984160bb9ce1bb (diff) | |
| parent | a4bcf67010a438a554696988e17f1066be629dba (diff) | |
| download | vcpkg-033c7d0af6a5f5129e73ebb63b1abea0db128da6.tar.gz vcpkg-033c7d0af6a5f5129e73ebb63b1abea0db128da6.zip | |
Merge remote-tracking branch 'refs/remotes/origin/master'
Diffstat (limited to 'ports/wt')
| -rw-r--r-- | ports/wt/CONTROL | 2 | ||||
| -rw-r--r-- | ports/wt/add-disable-boost-autolink-option.patch | 26 | ||||
| -rw-r--r-- | ports/wt/portfile.cmake | 10 |
3 files changed, 35 insertions, 3 deletions
diff --git a/ports/wt/CONTROL b/ports/wt/CONTROL index fc71d9aaf..1a89dd378 100644 --- a/ports/wt/CONTROL +++ b/ports/wt/CONTROL @@ -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 diff --git a/ports/wt/add-disable-boost-autolink-option.patch b/ports/wt/add-disable-boost-autolink-option.patch new file mode 100644 index 000000000..57cb3ed99 --- /dev/null +++ b/ports/wt/add-disable-boost-autolink-option.patch @@ -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) diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake index 66b1d5a33..f762eface 100644 --- a/ports/wt/portfile.cmake +++ b/ports/wt/portfile.cmake @@ -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() |