Skip to content
Snippets Groups Projects
Commit f2e15fc4 authored by James R.'s avatar James R.
Browse files

Merge branch 'cmake-curl-internal-fix' into 'master'

Fix compiling using cmake if internal libs is used

See merge request !1225
parents d7335469 d406340b
Branches
Tags
1 merge request!1225Fix compiling using cmake if internal libs is used
...@@ -230,7 +230,7 @@ set(SRB2_CONFIG_HAVE_GME ON CACHE BOOL ...@@ -230,7 +230,7 @@ set(SRB2_CONFIG_HAVE_GME ON CACHE BOOL
set(SRB2_CONFIG_HAVE_OPENMPT ON CACHE BOOL set(SRB2_CONFIG_HAVE_OPENMPT ON CACHE BOOL
"Enable OpenMPT support.") "Enable OpenMPT support.")
set(SRB2_CONFIG_HAVE_CURL ON CACHE BOOL set(SRB2_CONFIG_HAVE_CURL ON CACHE BOOL
"Enable curl support, used for downloading files via HTTP.") "Enable curl support.")
set(SRB2_CONFIG_HAVE_THREADS ON CACHE BOOL set(SRB2_CONFIG_HAVE_THREADS ON CACHE BOOL
"Enable multithreading support.") "Enable multithreading support.")
if(${CMAKE_SYSTEM} MATCHES Windows) if(${CMAKE_SYSTEM} MATCHES Windows)
...@@ -455,7 +455,7 @@ endif() ...@@ -455,7 +455,7 @@ endif()
if(${SRB2_CONFIG_HAVE_CURL}) if(${SRB2_CONFIG_HAVE_CURL})
if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
set(CURL_FOUND ON) set(CURL_FOUND ON)
set(CURL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/curl) set(CURL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/curl/include)
if(${SRB2_SYSTEM_BITS} EQUAL 64) if(${SRB2_SYSTEM_BITS} EQUAL 64)
set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib64 -lcurl") set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib64 -lcurl")
else() # 32-bit else() # 32-bit
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment