Skip to content
Browse files

Bumped cURL's version up.

Fixed mfc_upload_cli not being linked with cURL, and cURL not using 'rt'.
  • Loading branch information...
1 parent 0f384d7 commit 4a3f0c2b49a3266b457c2920c4562fb4409c1901 @Jookia Jookia committed
Showing with 4 additions and 2 deletions.
  1. +3 −1 cmake/modules/BuildCURL.cmake
  2. +1 −1 src/tools/mfc_upload_cli/CMakeLists.txt
View
4 cmake/modules/BuildCURL.cmake
@@ -6,7 +6,7 @@ else()
endif()
set(CURL_GIT git://github.com/bagder/curl.git)
-set(CURL_VERSION tags/curl-7_24_0)
+set(CURL_VERSION tags/curl-7_25_0)
if(WIN32)
ExternalProject_Add(
@@ -74,4 +74,6 @@ if(WIN32)
list(APPEND CURL_LIBRARIES "${CURL_LIBRARY_DIR}/libcurl_a.lib")
else()
list(APPEND CURL_LIBRARIES "${CURL_LIBRARY_DIR}/libcurl.a")
+
+ list(APPEND CURL_LIBRARIES "rt")
endif()
View
2 src/tools/mfc_upload_cli/CMakeLists.txt
@@ -6,13 +6,13 @@ file(GLOB Sources code/*.cpp )
add_executable(mfc_upload_cli ${Sources})
target_link_libraries(mfc_upload_cli
- rt
managers
managers_window
threads
usercore
util
util_fs
+ ${CURL_LIBRARIES}
${Boost_LIBRARIES}
${OPENSSL_LIBRARIES}
)

0 comments on commit 4a3f0c2

Please sign in to comment.
Something went wrong with that request. Please try again.