mirror of https://github.com/OpenRCT2/OpenRCT2.git
Require curl include when not DISABLE_HTTP
This commit is contained in:
parent
e7d875dd04
commit
73c8a0a4a8
|
@ -34,6 +34,14 @@ else ()
|
||||||
endif ()
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
if (NOT DISABLE_NETWORK AND NOT DISABLE_HTTP)
|
||||||
|
find_package(OpenSSL 1.0.0 REQUIRED)
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
if (NOT DISABLE_NETWORK AND WIN32)
|
||||||
|
target_link_libraries(${PROJECT} ws2_32 crypt32 wldap32 version winmm imm32 advapi32 shell32 ole32)
|
||||||
|
endif ()
|
||||||
|
|
||||||
if (NOT DISABLE_HTTP)
|
if (NOT DISABLE_HTTP)
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
find_package(curl REQUIRED)
|
find_package(curl REQUIRED)
|
||||||
|
@ -49,9 +57,6 @@ if (NOT DISABLE_HTTP)
|
||||||
${OPENSSL_LIBRARIES})
|
${OPENSSL_LIBRARIES})
|
||||||
endif ()
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
if (NOT DISABLE_NETWORK)
|
|
||||||
find_package(OpenSSL 1.0.0 REQUIRED)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
find_package(benchmark 1.4 QUIET)
|
find_package(benchmark 1.4 QUIET)
|
||||||
|
|
||||||
|
@ -109,12 +114,6 @@ if (UNIX AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "BSD")
|
||||||
target_link_libraries(${PROJECT} dl)
|
target_link_libraries(${PROJECT} dl)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (NOT DISABLE_NETWORK)
|
|
||||||
if (WIN32)
|
|
||||||
target_link_libraries(${PROJECT} ws2_32 crypt32 wldap32 version winmm imm32 advapi32 shell32 ole32)
|
|
||||||
endif ()
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
||||||
find_package(Threads REQUIRED)
|
find_package(Threads REQUIRED)
|
||||||
target_link_libraries(${PROJECT} Threads::Threads)
|
target_link_libraries(${PROJECT} Threads::Threads)
|
||||||
|
@ -159,7 +158,7 @@ target_include_directories(${PROJECT} PRIVATE ${LIBZIP_INCLUDE_DIRS})
|
||||||
target_include_directories(${PROJECT} PUBLIC ${JANSSON_INCLUDE_DIRS})
|
target_include_directories(${PROJECT} PUBLIC ${JANSSON_INCLUDE_DIRS})
|
||||||
target_include_directories(${PROJECT} PRIVATE ${PNG_INCLUDE_DIRS}
|
target_include_directories(${PROJECT} PRIVATE ${PNG_INCLUDE_DIRS}
|
||||||
${ZLIB_INCLUDE_DIRS})
|
${ZLIB_INCLUDE_DIRS})
|
||||||
if (NOT DISABLE_HTTP_TWITCH OR NOT DISABLE_NETWORK)
|
if (NOT DISABLE_HTTP)
|
||||||
target_include_directories(${PROJECT} PRIVATE ${LIBCURL_INCLUDE_DIRS})
|
target_include_directories(${PROJECT} PRIVATE ${LIBCURL_INCLUDE_DIRS})
|
||||||
endif ()
|
endif ()
|
||||||
if (NOT DISABLE_NETWORK)
|
if (NOT DISABLE_NETWORK)
|
||||||
|
|
Loading…
Reference in New Issue