Mercurial > hg > orthanc
diff Resources/CMake/LibCurlConfiguration.cmake @ 30:89383427856a
removal of old stuff for curl
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 29 Aug 2012 15:29:08 +0200 |
parents | 042ac60f5bf9 |
children | 0c3e317f35e8 |
line wrap: on
line diff
--- a/Resources/CMake/LibCurlConfiguration.cmake Wed Aug 29 15:27:13 2012 +0200 +++ b/Resources/CMake/LibCurlConfiguration.cmake Wed Aug 29 15:29:08 2012 +0200 @@ -2,39 +2,10 @@ SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-7.26.0) DownloadPackage("http://curl.haxx.se/download/curl-7.26.0.tar.gz" "${CURL_SOURCES_DIR}" "" "") - if (0) - if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - SET(SOURCE_CONFIG ${CMAKE_SOURCE_DIR}/Resources/libcurl/WithSsl/x86_64-linux) - elseif ("${CMAKE_SIZEOF_VOID_P}" EQUAL "4") - SET(SOURCE_CONFIG ${CMAKE_SOURCE_DIR}/Resources/libcurl/i686-pc-linux-gnu) - else() - message(FATAL_ERROR "Support your platform here") - endif() - elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") - if (${MSVC}) - SET(SOURCE_CONFIG ${CMAKE_SOURCE_DIR}/Resources/libcurl/msvc) - else() - SET(SOURCE_CONFIG ${CMAKE_SOURCE_DIR}/Resources/libcurl/i586-mingw32msvc) - endif() - else() - message(FATAL_ERROR "Support your platform here") - endif() - - if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - configure_file("${SOURCE_CONFIG}/curl_config.h" "${CURL_SOURCES_DIR}/lib/curl_config.h" COPYONLY) - configure_file("${SOURCE_CONFIG}/curlbuild.h" "${CURL_SOURCES_DIR}/include/curl/curlbuild.h" COPYONLY) - elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") - configure_file("${SOURCE_CONFIG}/curlbuild.h" "${CURL_SOURCES_DIR}/include/curl/curlbuild.h" COPYONLY) - endif() - endif() - include_directories(${CURL_SOURCES_DIR}/include) - AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib CURL_SOURCES) source_group(ThirdParty\\LibCurl REGULAR_EXPRESSION ${CURL_SOURCES_DIR}/.*) - #list(APPEND THIRD_PARTY_SOURCES ${CURL_SOURCES}) add_library(Curl STATIC ${CURL_SOURCES}) link_libraries(Curl) @@ -67,9 +38,6 @@ endif() if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - #set_property( - # SOURCE ${CURL_SOURCES} - # PROPERTY COMPILE_DEFINITIONS HAVE_CONFIG_H) if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") SET(TMP_OS "x86_64") else()