diff --git a/CMakeLists.txt b/CMakeLists.txt index 0dc5c9880..6e2f49029 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -190,7 +190,7 @@ find_package(CURL 7.28.0) if (NOT CURL_FOUND) set(CURL_SOURCE_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/externals/curl") set(CURL_BUILT_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/externals/curl") - externalproject_add( + externalproject_add(curl PREFIX SOURCE_DIR ${CURL_SOURCE_PREFIX} CMAKE_CACHE_ARGS -DBUILD_CURL_EXE:string=off @@ -201,7 +201,11 @@ if (NOT CURL_FOUND) ) include_directories("${CURL_BUILT_PREFIX}/include") link_directories("${CURL_BUILT_PREFIX}/lib") - set(CURL_LIBRARIES "curl") + if (NOT MSVC) + set(CURL_LIBRARIES "curl") + else() + set(CURL_LIBRARIES "libcurl_imp") + endif() else() include_directories(${CURL_INCLUDE_DIRS}) endif() diff --git a/appveyor.yml b/appveyor.yml index 722b607b3..edcf61d8e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,6 +15,10 @@ platform: configuration: - Release +build: + parallel: true + project: build/ALL_BUILD.vcxproj + install: - git submodule update --init --recursive diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 6930e0485..d366b3cd2 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -220,3 +220,4 @@ set(HEADERS create_directory_groups(${SRCS} ${HEADERS}) add_library(core STATIC ${SRCS} ${HEADERS}) +add_dependencies(core curl)