[wt] Fix XML file installation path (#6925)

This commit is contained in:
wangli28 2019-06-18 01:30:25 +08:00 committed by Phil Christensen
parent 1e297085c7
commit 1dbb58814f
3 changed files with 20 additions and 1 deletions

View File

@ -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")

View File

@ -1,5 +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

View File

@ -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