mirror of
https://github.com/SantaSpeen/BeamMP-Server.git
synced 2026-06-19 06:40:53 +00:00
fix curl, print segfault
This commit is contained in:
+9
-6
@@ -7,6 +7,15 @@ project(BeamMP-Server
|
||||
message(STATUS "You can find build instructions and a list of dependencies in the README at \
|
||||
https://github.com/BeamMP/BeamMP-Server")
|
||||
|
||||
set(BUILD_CURL_EXE OFF)
|
||||
set(BUILD_SHARED_LIBS ON)
|
||||
set(CURL_WERROR OFF)
|
||||
if (WIN32)
|
||||
set(CURL_STATIC_CRT ON)
|
||||
endif()
|
||||
add_subdirectory("include/curl")
|
||||
|
||||
|
||||
add_subdirectory("include/sentry-native")
|
||||
|
||||
message(STATUS "Setting compiler flags")
|
||||
@@ -18,7 +27,6 @@ if (WIN32)
|
||||
set(VcpkgRoot ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET})
|
||||
include_directories(${VcpkgRoot}/include)
|
||||
link_directories(${VcpkgRoot}/lib)
|
||||
set(CURL_STATIC_CRT ON)
|
||||
elseif (UNIX)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -static-libstdc++")
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g")
|
||||
@@ -29,11 +37,6 @@ elseif (UNIX)
|
||||
endif (SANITIZE)
|
||||
endif ()
|
||||
|
||||
set(BUILD_CURL_EXE OFF)
|
||||
set(BUILD_SHARED_LIBS ON)
|
||||
set(CURL_WERROR OFF)
|
||||
add_subdirectory("include/curl")
|
||||
|
||||
message(STATUS "Checking for Sentry URL")
|
||||
# this is set by the build system.
|
||||
# IMPORTANT: if you're building from source, just leave this empty
|
||||
|
||||
Reference in New Issue
Block a user