diff options
Diffstat (limited to 'ports/wt')
| -rw-r--r-- | ports/wt/0004-link-ssl.patch | 46 | ||||
| -rw-r--r-- | ports/wt/CONTROL | 2 | ||||
| -rw-r--r-- | ports/wt/portfile.cmake | 8 |
3 files changed, 54 insertions, 2 deletions
diff --git a/ports/wt/0004-link-ssl.patch b/ports/wt/0004-link-ssl.patch new file mode 100644 index 000000000..8579223dc --- /dev/null +++ b/ports/wt/0004-link-ssl.patch @@ -0,0 +1,46 @@ +diff --git a/cmake/WtFindSsl.txt b/cmake/WtFindSsl.txt +index c5f7bbc8..6e2c2f4d 100644 +--- a/cmake/WtFindSsl.txt ++++ b/cmake/WtFindSsl.txt +@@ -121,6 +121,16 @@ ELSEIF(APPLE) + /usr/local/lib + NO_DEFAULT_PATH + ) ++ FIND_LIBRARY(CRYPTO_LIB ++ NAMES ++ crypto ++ PATHS ++ ${SSL_PREFIX}/lib ++ ${SSL_PREFIX}/lib/VC ++ /usr/lib ++ /usr/local/lib ++ NO_DEFAULT_PATH ++ ) + ELSE (WIN32) + FIND_LIBRARY(SSL_LIB + NAMES +@@ -131,6 +141,15 @@ ELSE (WIN32) + /usr/lib + /usr/local/lib + ) ++ FIND_LIBRARY(CRYPTO_LIB ++ NAMES ++ crypto ++ PATHS ++ ${SSL_PREFIX}/lib ++ ${SSL_PREFIX}/lib/VC ++ /usr/lib ++ /usr/local/lib ++ ) + ENDIF (WIN32) + + IF(SSL_LIB +@@ -144,7 +163,7 @@ IF(SSL_LIB + ENDIF(SSL_TOO_LIB) + ELSE(WIN32) + SET(SSL_FOUND true) +- SET(SSL_LIBRARIES ${SSL_LIB} -lcrypto) ++ SET(SSL_LIBRARIES ${SSL_LIB} ${CRYPTO_LIB}) + ENDIF(WIN32) + ENDIF(SSL_LIB + AND SSL_INCLUDE_DIRS) diff --git a/ports/wt/CONTROL b/ports/wt/CONTROL index ff99b10b5..a66c39f42 100644 --- a/ports/wt/CONTROL +++ b/ports/wt/CONTROL @@ -1,4 +1,4 @@ Source: wt -Version: 4.0.4 +Version: 4.0.4-2 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 614480168..0ac9fef61 100644 --- a/ports/wt/portfile.cmake +++ b/ports/wt/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( 0001-boost-1.66.patch 0002-link-glew.patch 0003-disable-boost-autolink.patch + 0004-link-ssl.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS) @@ -36,13 +37,18 @@ vcpkg_configure_cmake( -DUSE_SYSTEM_SQLITE3=ON -DUSE_SYSTEM_GLEW=ON + + -DCMAKE_INSTALL_DIR=share ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/wt) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/wt) # 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) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/var) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/var) + file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wt RENAME copyright) vcpkg_copy_pdbs() |