Northern_Lights/nekoray_Mahdi-zarei
1
0
Fork 0
mirror of https://github.com/Mahdi-zarei/nekoray.git synced 2025-12-19 13:50:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Try to fix curl build

Browse Source
This commit is contained in:
unknown 2024-08-12 21:04:08 +03:30
parent 0795d14bf1
commit 88b801545f
No known key found for this signature in database
GPG Key ID: C2CA486E4F771093
3 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
CMakeLists.txt
View File

@ -28,16 +28,11 @@ endif ()
#### default prefix path ####
if (NOT NKR_LIBS)
if (NKR_PACKAGE)
list(APPEND NKR_LIBS ${CMAKE_SOURCE_DIR}/libs/deps/package)
else ()
list(APPEND NKR_LIBS ${CMAKE_SOURCE_DIR}/libs/deps/built)
endif ()
endif ()
if (NOT NKR_DISABLE_LIBS)
list(APPEND CMAKE_PREFIX_PATH ${NKR_LIBS})
list(APPEND NKR_LIBS ${CMAKE_SOURCE_DIR}/libs/deps/built)
list(APPEND CMAKE_PREFIX_PATH ${NKR_LIBS})
if(WIN32)
list(APPEND CMAKE_PREFIX_PATH "libs/deps/built/x64-windows-static")
add_definitions(-DCURL_STATICLIB)
endif ()
message("[CMAKE_PREFIX_PATH] ${CMAKE_PREFIX_PATH}")
@ -66,15 +61,7 @@ list(APPEND NKR_EXTERNAL_TARGETS yaml-cpp)
find_package(ZXing CONFIG REQUIRED)
list(APPEND NKR_EXTERNAL_TARGETS ZXing::ZXing)
IF (WIN32)
include(FetchContent)
FetchContent_Declare(cpr GIT_REPOSITORY https://github.com/libcpr/cpr.git
GIT_TAG 3b15fa82ea74739b574d705fea44959b58142eb8)
FetchContent_MakeAvailable(cpr)
ELSE()
find_package(cpr REQUIRED)
ENDIF()
find_package(cpr REQUIRED)
list(APPEND NKR_EXTERNAL_TARGETS cpr::cpr)
set(QHOTKEY_INSTALL OFF)

56
libs/build_deps_all.sh
View File

@ -14,17 +14,13 @@ fi
# libs/deps/...
mkdir -p $deps
cd $deps
if [ -z $NKR_PACKAGE ]; then
INSTALL_PREFIX=$PWD/built
else
INSTALL_PREFIX=$PWD/package
fi
rm -rf $INSTALL_PREFIX
mkdir -p $INSTALL_PREFIX
INSTALL_PREFIX=$PWD/built
#rm -rf $INSTALL_PREFIX
#mkdir -p $INSTALL_PREFIX
#### clean ####
clean() {
rm -rf dl.zip yaml-* zxing-* protobuf curl cpr
rm -rf dl.zip yaml-* zxing-* protobuf curl cpr libpsl* zlib
}
#### ZXing v2.2.0 ####
@ -71,29 +67,45 @@ ninja && ninja install
cd ../..
system_name=$(uname -s)
if [[ "$(uname -s)" == *"NT"* ]]; then
git clone https://github.com/Microsoft/vcpkg.git
cd vcpkg
export VCPKG_BUILD_TYPE="release"
export VCPKG_LIBRARY_LINKAGE="static"
./bootstrap-vcpkg.sh
./vcpkg integrate install
./vcpkg install curl:x64-windows-static --x-install-root=$INSTALL_PREFIX
# Check if 'NT' is present in the system name
if [[ "$system_name" == *"NT"* ]]; then
echo "System is likely Windows"
else
git clone https://github.com/curl/curl.git
cd curl
git checkout 83bedbd730d62b83744cc26fa0433d3f6e2e4cd6
mkdir build && cd build
cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX
ninja && ninja install
cd ../..
cd ..
git clone https://github.com/libcpr/cpr.git
cd cpr
git checkout 3b15fa82ea74739b574d705fea44959b58142eb8
sed -i 's/find_package(CURL COMPONENTS HTTP HTTPS)/find_package(CURL REQUIRED)/g' CMakeLists.txt
mkdir build && cd build
cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DCPR_USE_SYSTEM_CURL=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX
cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DCPR_USE_SYSTEM_CURL=ON -DBUILD_SHARED_LIBS=OFF -DCURL_STATICLIB=ON -DCURL_LIBRARY=../../built/x64-windows-static/lib -DCURL_INCLUDE_DIR=../../built/x64-windows-static/include -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX
ninja && ninja install
cd ../..
else
git clone https://github.com/curl/curl.git
cd curl
git checkout 83bedbd730d62b83744cc26fa0433d3f6e2e4cd6
mkdir build && cd build
cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX
ninja && ninja install
cd ../..
git clone https://github.com/libcpr/cpr.git
cd cpr
git checkout 3b15fa82ea74739b574d705fea44959b58142eb8
mkdir build && cd build
cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DCPR_USE_SYSTEM_CURL=ON -DBUILD_SHARED_LIBS=OFF -DCURL_STATICLIB=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX
ninja && ninja install
cd ../..
fi
####

5
main/main.cpp
View File

@ -16,6 +16,11 @@
#ifdef Q_OS_WIN
#include "sys/windows/MiniDump.h"
#pragma comment (lib, "cpr.lib")
#pragma comment (lib, "libcurl.lib")
#pragma comment (lib, "Ws2_32.lib")
#pragma comment (lib, "Wldap32.lib")
#pragma comment (lib, "Crypt32.lib")
#endif
void signal_handler(int signum) {