diff options
| author | grdowns <grdowns@microsoft.com> | 2019-06-28 17:32:12 -0700 |
|---|---|---|
| committer | grdowns <grdowns@microsoft.com> | 2019-06-28 17:32:12 -0700 |
| commit | e27fe911982284788e63f4a92339386554706a4b (patch) | |
| tree | e695af1d6733cea93a29adab73ff819430ff872e /ports/wt | |
| parent | 1586330395db0bfa14c40c4b1a8d4da6c8f7c5f7 (diff) | |
| parent | 62ed7c17318b4f46109c2de73b7584fb04e85720 (diff) | |
| download | vcpkg-e27fe911982284788e63f4a92339386554706a4b.tar.gz vcpkg-e27fe911982284788e63f4a92339386554706a4b.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into openssl-version-bump
Diffstat (limited to 'ports/wt')
| -rw-r--r-- | ports/wt/0005-XML_file_path.patch | 17 | ||||
| -rw-r--r-- | ports/wt/CONTROL | 3 | ||||
| -rw-r--r-- | ports/wt/portfile.cmake | 6 |
3 files changed, 23 insertions, 3 deletions
diff --git a/ports/wt/0005-XML_file_path.patch b/ports/wt/0005-XML_file_path.patch new file mode 100644 index 000000000..b2be62c9d --- /dev/null +++ b/ports/wt/0005-XML_file_path.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ca19b30..4765632 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -197,7 +197,11 @@ SET(CMAKE_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake" CACHE STRING + + IF(WIN32) + +- SET(RUNDIR "c:/witty") # Does not apply to win32 ++ if (NOT INSTALL_CONFIG_FILE_PATH) ++ SET(RUNDIR "c:/witty") # Does not apply to win32 ++ else() ++ SET(RUNDIR ${INSTALL_CONFIG_FILE_PATH}) # Does not apply to win32 ++ endif() + + IF(NOT DEFINED CONFIGDIR) + SET(CONFIGDIR ${RUNDIR} CACHE STRING "Path for the configuration files") diff --git a/ports/wt/CONTROL b/ports/wt/CONTROL index 5db330a5c..b712ca738 100644 --- a/ports/wt/CONTROL +++ b/ports/wt/CONTROL @@ -1,4 +1,5 @@ Source: wt -Version: 4.0.5 +Version: 4.0.5-1 +Homepage: https://github.com/emweb/wt Description: Wt is a C++ library for developing web applications Build-Depends: openssl, sqlite3, libpq, pango, glew, boost-date-time, boost-regex, boost-program-options, boost-signals, boost-system, boost-filesystem, boost-thread, boost-random, boost-multi-index, boost-signals2, boost-asio, boost-ublas, boost-conversion, boost-array, boost-smart-ptr, boost-tuple, boost-algorithm, boost-logic, boost-interprocess diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake index c9fb520f6..bc39a7a64 100644 --- a/ports/wt/portfile.cmake +++ b/ports/wt/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( 0002-link-glew.patch 0003-disable-boost-autolink.patch 0004-link-ssl.patch + 0005-XML_file_path.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS) @@ -18,6 +19,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + -DINSTALL_CONFIG_FILE_PATH="${DOWNLOADS}/wt" -DSHARED_LIBS=${SHARED_LIBS} -DBOOST_DYNAMIC=ON -DDISABLE_BOOST_AUTOLINK=ON @@ -39,9 +41,9 @@ vcpkg_configure_cmake( -DCMAKE_INSTALL_DIR=share ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/wt) +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() # There is no way to suppress installation of the headers and resource files in debug build. file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) |