Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions libs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ if (WITH_APACHE)
-Wno-dev
-DAPR_INSTALL_PRIVATE_H=ON
-DINSTALL_PDB=OFF
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
)
else()
set(APR_CONFIGS
Expand All @@ -166,8 +167,8 @@ if (WITH_APACHE)
if(WIN32)
ExternalProject_Add(EXPAT
${EP_CONFIGS}
URL https://github.com/libexpat/libexpat/releases/download/R_2_5_0/expat-2.5.0.tar.gz
URL_HASH SHA256=6b902ab103843592be5e99504f846ec109c1abb692e85347587f237a4ffa1033
URL https://github.com/libexpat/libexpat/releases/download/R_2_8_4/expat-2.8.4.tar.gz
URL_HASH SHA256=b8ece2437692dad44d851c4532723390a5a330990007706be9c8d2b90d294f36
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/libs/src/install-prefix
-Wno-dev
Expand All @@ -179,6 +180,7 @@ if (WITH_APACHE)
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/libs/src/install-prefix
-Wno-dev
-DINSTALL_PDB=OFF
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
${EXPAT_CONF}
PATCH_COMMAND ${CMAKE_COMMAND} -Dapr-util_source=${CMAKE_BINARY_DIR}/libs/src/APRutil -P ${CMAKE_SOURCE_DIR}/cmake/patch_apr-util.cmake
)
Expand Down Expand Up @@ -254,9 +256,8 @@ if (WITH_APACHE)
${EP_CONFIGS}
DEPENDS ${APR_DEP} ${APRUTIL_DEP} ${OPENSSL_DEP} ${PCRE_DEP} ${ZLIB_DEP}
URL
https://archive.apache.org/dist/httpd/httpd-2.4.55.tar.gz
https://github.com/HaxeFoundation/neko/files/10745746/httpd-2.4.55.tar.gz
URL_HASH SHA256=5276ea8bc6fff31eed5c82132ae51a0b2ee05f9e6b61a00fa877f6cadab3b638
https://archive.apache.org/dist/httpd/httpd-2.4.68.tar.gz
URL_HASH SHA256=ed9a9d4500fb48bb28eaffb3ba71d06ccf86d498fa13ab9f781da010cc488498
${Apache_CONFIGS}
)
set_target_properties(Apache PROPERTIES ${EP_PROPS})
Expand Down
4 changes: 2 additions & 2 deletions libs/regexp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ if (STATIC_PCRE2)
COMPILE_DEFINITIONS PCRE2_STATIC_LINK
)
set(PCRE2_CONFIG
URL https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.gz
URL_HASH SHA256=c33b418e3b936ee3153de2c61cc638e7e4fe3156022a5c77d0711bcbb9d64f1f
URL https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.48/pcre2-10.48.tar.gz
URL_HASH SHA256=ebcc25aadf2a51fa1fefa9b8bc9e7a79b3dae86870a0f1152a22e42befd46888
)
if (WIN32)
ExternalProject_Add(pcre2
Expand Down