early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

23
externals/vcpkg/ports/wt/0002-link-glew.patch vendored Executable file
View File

@@ -0,0 +1,23 @@
From 6301c4ccaf8d3b6982898fed84e691ab8ddd7a4f Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Fri, 23 Feb 2018 03:12:45 -0800
Subject: [PATCH 2/3] link glew
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 80734fb..70e755b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -556,7 +556,8 @@ ENDIF("${WT_WRASTERIMAGE_IMPLEMENTATION}" STREQUAL "GraphicsMagick")
IF(HAVE_GL)
INCLUDE_DIRECTORIES(${GL_INCLUDE_DIRS})
IF(USE_SYSTEM_GLEW)
- TARGET_LINK_LIBRARIES(wt PRIVATE GLEW)
+ find_package(glew REQUIRED)
+ TARGET_LINK_LIBRARIES(wt PRIVATE GLEW::GLEW)
ENDIF(USE_SYSTEM_GLEW)
TARGET_LINK_LIBRARIES(wt PRIVATE ${GL_LIBRARIES})
ELSE(HAVE_GL)
--
2.16.2.windows.1

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

@@ -0,0 +1,29 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5012cfd1b..95f812685 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -338,7 +338,7 @@ ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
IF (${WT_WRASTERIMAGE_IMPLEMENTATION} STREQUAL "GraphicsMagick")
- IF (NOT GM_FOUND)
+ IF (0)
MESSAGE(FATAL_ERROR "WT_WRASTERIMAGE_IMPLEMENTATION set to GraphicsMagick but GM is not found. Indicate the location of your graphicsmagick library using -DGM_PREFIX=...")
ENDIF (NOT GM_FOUND)
SET(WT_HAS_WRASTERIMAGE true)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 78d82ee53..01ac5f42a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -595,8 +595,9 @@ ELSE(HAVE_HARU)
ENDIF(HAVE_HARU)
IF("${WT_WRASTERIMAGE_IMPLEMENTATION}" STREQUAL "GraphicsMagick")
- TARGET_LINK_LIBRARIES(wt PRIVATE ${GM_LIBRARIES})
- INCLUDE_DIRECTORIES(${GM_INCLUDE_DIRS})
+ find_package(unofficial-graphicsmagick REQUIRED)
+ TARGET_LINK_LIBRARIES(wt PRIVATE unofficial::graphicsmagick::graphicsmagick)
+ # INCLUDE_DIRECTORIES(${GM_INCLUDE_DIRS})
ADD_DEFINITIONS(-DHAVE_GRAPHICSMAGICK)
ELSEIF("${WT_WRASTERIMAGE_IMPLEMENTATION}" STREQUAL "skia")
TARGET_LINK_LIBRARIES(wt PRIVATE ${SKIA_LIBRARIES})

95
externals/vcpkg/ports/wt/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,95 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO emweb/wt
REF d0e9f2e8096a1acb4558130a851812dd424d8f3e # 4.7.1
SHA512 ddda642e464a0c93017161404911cd8261e105971162171cd6aa0e4334e22b5f284a753e8b81a4f43c9269b14389abd28c61e2cdfe706b414808e82fc4bc1680
HEAD_REF master
PATCHES
0002-link-glew.patch
0005-XML_file_path.patch
0006-GraphicsMagick.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS)
vcpkg_check_features(
OUT_FEATURE_OPTIONS
FEATURE_OPTIONS
FEATURES
dbo ENABLE_LIBWTDBO
postgresql ENABLE_POSTGRES
sqlite3 ENABLE_SQLITE
sqlserver ENABLE_MSSQLSERVER
openssl ENABLE_SSL
)
if(VCPKG_TARGET_IS_WINDOWS)
set(WT_PLATFORM_SPECIFIC_OPTIONS
-DWT_WRASTERIMAGE_IMPLEMENTATION=Direct2D
-DCONNECTOR_ISAPI=ON
-DENABLE_PANGO=OFF)
else()
set(WT_PLATFORM_SPECIFIC_OPTIONS
-DCONNECTOR_FCGI=OFF
-DENABLE_PANGO=ON
-DHARFBUZZ_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/harfbuzz)
if ("graphicsmagick" IN_LIST FEATURES)
list(APPEND WT_PLATFORM_SPECIFIC_OPTIONS
-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick)
else()
list(APPEND WT_PLATFORM_SPECIFIC_OPTIONS
-DWT_WRASTERIMAGE_IMPLEMENTATION=none)
endif()
endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
GENERATOR Ninja
OPTIONS
-DINSTALL_CONFIG_FILE_PATH="${DOWNLOADS}/wt"
-DSHARED_LIBS=${SHARED_LIBS}
-DBOOST_DYNAMIC=${SHARED_LIBS}
-DDISABLE_BOOST_AUTOLINK=ON
-DBUILD_EXAMPLES=OFF
-DBUILD_TESTS=OFF
-DWTHTTP_CONFIGURATION=
-DCONFIGURATION=
-DCONNECTOR_HTTP=ON
-DENABLE_HARU=ON
-DHARU_DYNAMIC=${SHARED_LIBS}
-DENABLE_MYSQL=OFF
-DENABLE_FIREBIRD=OFF
-DENABLE_QT4=OFF
-DENABLE_QT5=OFF
-DENABLE_LIBWTTEST=ON
-DENABLE_OPENGL=ON
${FEATURE_OPTIONS}
${WT_PLATFORM_SPECIFIC_OPTIONS}
-DUSE_SYSTEM_SQLITE3=ON
-DUSE_SYSTEM_GLEW=ON
-DCMAKE_INSTALL_DIR=share
# see https://redmine.webtoolkit.eu/issues/9646
-DWTHTTP_CONFIGURATION=
-DCONFIGURATION=
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup()
# 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" "${CURRENT_PACKAGES_DIR}/debug/var")
# RUNDIR is only used for wtfcgi what we don't build. See https://redmine.webtoolkit.eu/issues/9646
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" "#define RUNDIR \"${CURRENT_PACKAGES_DIR}/var/run/wt\"" "")
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_copy_pdbs()

116
externals/vcpkg/ports/wt/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,116 @@
{
"name": "wt",
"version": "4.7.1",
"description": "Wt is a C++ library for developing web applications",
"homepage": "https://github.com/emweb/wt",
"license": "GPL-2.0-only",
"dependencies": [
"boost-algorithm",
"boost-array",
"boost-asio",
"boost-bind",
"boost-config",
"boost-container-hash",
"boost-filesystem",
"boost-foreach",
"boost-fusion",
"boost-interprocess",
"boost-lexical-cast",
"boost-logic",
"boost-math",
"boost-multi-index",
"boost-optional",
"boost-phoenix",
"boost-pool",
"boost-program-options",
"boost-range",
"boost-serialization",
"boost-smart-ptr",
"boost-spirit",
"boost-system",
"boost-thread",
"boost-tokenizer",
"boost-tuple",
"boost-ublas",
"boost-variant",
"glew",
{
"name": "harfbuzz",
"platform": "!windows"
},
"libharu",
"libpng",
{
"name": "pango",
"platform": "!windows"
},
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
},
"zlib"
],
"default-features": [
"openssl"
],
"features": {
"dbo": {
"description": "Wt::Dbo"
},
"graphicsmagick": {
"description": "WRasterImage support on non-Windows based on GraphicsMagick",
"dependencies": [
"graphicsmagick"
]
},
"openssl": {
"description": "TLS support",
"dependencies": [
"openssl"
]
},
"postgresql": {
"description": "Wt::Dbo PostgreSQL backend",
"dependencies": [
"libpq",
{
"name": "wt",
"features": [
"dbo"
]
}
]
},
"sqlite3": {
"description": "Wt::Dbo Sqlite 3 backend",
"dependencies": [
"sqlite3",
{
"name": "wt",
"features": [
"dbo"
]
}
]
},
"sqlserver": {
"description": "Wt::Dbo MS SQL Server backend",
"dependencies": [
{
"name": "unixodbc",
"platform": "!windows"
},
{
"name": "wt",
"features": [
"dbo"
]
}
]
}
}
}