From 33368e31642aa388ea89a0c372b29e603351a2c0 Mon Sep 17 00:00:00 2001 From: Marek Kotewicz Date: Thu, 6 Nov 2014 11:49:40 +0100 Subject: [PATCH] curl properly building to build dir --- extdep/CMakeLists.txt | 1 + extdep/cryptopp.cmake | 3 +-- extdep/curl.cmake | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/extdep/CMakeLists.txt b/extdep/CMakeLists.txt index 766053655..c89457f01 100644 --- a/extdep/CMakeLists.txt +++ b/extdep/CMakeLists.txt @@ -8,5 +8,6 @@ set(ETH_DEPENDENCY_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/install") file(MAKE_DIRECTORY ${ETH_DEPENDENCY_INSTALL_DIR}) include(cryptopp.cmake) +include(curl.cmake) #include(miniupnpc.cmake) diff --git a/extdep/cryptopp.cmake b/extdep/cryptopp.cmake index a8e28b43e..0f83d0115 100644 --- a/extdep/cryptopp.cmake +++ b/extdep/cryptopp.cmake @@ -7,8 +7,7 @@ ExternalProject_Add(cryptopp INSTALL_COMMAND make dynamic install PREFIX=${ETH_DEPENDENCY_INSTALL_DIR} ) else() -ExternalProject_Add( - cryptopp +ExternalProject_Add(cryptopp URL https://github.com/mmoss/cryptopp/archive/v5.6.2.zip BINARY_DIR cryptopp-prefix/src/cryptopp CONFIGURE_COMMAND "" diff --git a/extdep/curl.cmake b/extdep/curl.cmake index c98c98b9f..5d915c79b 100644 --- a/extdep/curl.cmake +++ b/extdep/curl.cmake @@ -1,11 +1,12 @@ -include(ExternalProject) - +if(${APPLE}) ExternalProject_Add(curl URL http://curl.haxx.se/download/curl-7.38.0.tar.bz2 BINARY_DIR curl-prefix/src/curl - CONFIGURE_COMMAND ./configure --with-darwinssl + CONFIGURE_COMMAND ./configure --with-darwinssl --prefix=${ETH_DEPENDENCY_INSTALL_DIR} --exec-prefix=${ETH_DEPENDENCY_INSTALL_DIR} BUILD_COMMAND make -j 3 - INSTALL_COMMAND "" + INSTALL_COMMAND make install ) +else() +endif()