Commit 5cf12744 authored by Rashad Kanavath's avatar Rashad Kanavath
Browse files

SuperBuild: curl use a fixed install prefix (we don't do multi-config ever)

parent 4f92f7bf
......@@ -11,23 +11,10 @@ endif()
if(MSVC)
if(NOT BUILD_SHARED_LIBS)
message(FATAL_ERROR "static build or curl not supported")
endif()
if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "amd64" OR
"${CMAKE_SYSTEM_PROCESSOR}" MATCHES "AMD64" )
set(CURL_INSTALL_DIR_PREFIX "libcurl-vc-x64")
else()
set(CURL_INSTALL_DIR_PREFIX "libcurl-vc-x86")
endif()
if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
set(CURL_INSTALL_DIR_PREFIX "${CURL_INSTALL_DIR_PREFIX}-release")
else()
set(CURL_INSTALL_DIR_PREFIX "${CURL_INSTALL_DIR_PREFIX}-debug")
endif()
ExternalProject_Add(CURL
PREFIX CURL
URL "http://curl.haxx.se/download/curl-7.40.0.tar.gz"
......@@ -41,7 +28,7 @@ endif()
CONFIGURE_COMMAND ""
BUILD_COMMAND nmake /f ${CURL_SB_BUILD_DIR}/winbuild/Makefile.vc mode=dll WITH_ZLIB=dll WITH_DEVEL=${SB_INSTALL_PREFIX}
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
${CURL_SB_BUILD_DIR}/builds/${CURL_INSTALL_DIR_PREFIX}-dll-zlib-dll-ipv6-sspi-winssl/ ${SB_INSTALL_PREFIX}
${CURL_SB_BUILD_DIR}/builds/libcurl-vc-install/ ${SB_INSTALL_PREFIX}
)
else(UNIX)
......
diff -burN curl-7.40.0.orig/winbuild/Makefile.vc curl-7.40.0/winbuild/Makefile.vc
--- curl-7.40.0.orig/winbuild/Makefile.vc Fri Jul 8 16:09:05 2016
+++ curl-7.40.0/winbuild/Makefile.vc Fri Jul 8 16:10:02 2016
@@ -123,7 +123,7 @@
SSH2 = static
+++ curl-7.40.0/winbuild/Makefile.vc Fri Jul 8 16:45:40 2016
@@ -161,6 +161,8 @@
CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-winssl
!ENDIF
-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-vc$(VC)-$(MACHINE)
+CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-vc$(VC)
+CONFIG_NAME_LIB = libcurl-vc-install
+
!MESSAGE configuration name: $(CONFIG_NAME_LIB)
!IF "$(DEBUG)"=="yes"
CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-debug
BUILD_DIR=../builds/$(CONFIG_NAME_LIB)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment