diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-09-29 19:47:46 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-09-29 19:47:46 (GMT) |
| commit | 6cf99d7bea3db24c27f08884239aae24bbd2b677 (patch) | |
| tree | 2dda62019b67ca3774550da8af3d650d3bfab5b9 /Utilities | |
| parent | 5824aa614353b7a5443ab7fdfa95eddf062e04be (diff) | |
| download | CMake-6cf99d7bea3db24c27f08884239aae24bbd2b677.zip CMake-6cf99d7bea3db24c27f08884239aae24bbd2b677.tar.gz CMake-6cf99d7bea3db24c27f08884239aae24bbd2b677.tar.bz2 | |
ENH: check in ability to build with new curl -f -DCMAKE_USE_NEW_CURL is set
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmThirdParty.h.in | 1 | ||||
| -rw-r--r-- | Utilities/cm_curl.h | 6 | ||||
| -rw-r--r-- | Utilities/cmcurl-7.19.0/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Utilities/cmcurl-7.19.0/docs/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Utilities/cmcurl-7.19.0/include/curl/curl.h | 2 | ||||
| -rw-r--r-- | Utilities/cmcurl-7.19.0/lib/CMakeLists.txt | 1 |
6 files changed, 12 insertions, 5 deletions
diff --git a/Utilities/cmThirdParty.h.in b/Utilities/cmThirdParty.h.in index 845a1bd..0133428 100644 --- a/Utilities/cmThirdParty.h.in +++ b/Utilities/cmThirdParty.h.in @@ -22,5 +22,6 @@ #cmakedefine CMAKE_USE_SYSTEM_EXPAT #cmakedefine CMAKE_USE_SYSTEM_XMLRPC #cmakedefine CMAKE_USE_SYSTEM_ZLIB +#cmakedefine CMAKE_USE_NEW_CURL #endif diff --git a/Utilities/cm_curl.h b/Utilities/cm_curl.h index 0fcb5c5..9736b35 100644 --- a/Utilities/cm_curl.h +++ b/Utilities/cm_curl.h @@ -22,7 +22,11 @@ #ifdef CMAKE_USE_SYSTEM_CURL # include <curl/curl.h> #else -# include <cmcurl/curl/curl.h> +# ifdef CMAKE_USE_NEW_CURL +# include <cmcurl-7.19.0/include/curl/curl.h> +# else CMAKE_USE_NEW_CURL +# include <cmcurl/curl/curl.h> +# endif #endif #endif diff --git a/Utilities/cmcurl-7.19.0/CMakeLists.txt b/Utilities/cmcurl-7.19.0/CMakeLists.txt index 69945ef..f9a2151 100644 --- a/Utilities/cmcurl-7.19.0/CMakeLists.txt +++ b/Utilities/cmcurl-7.19.0/CMakeLists.txt @@ -42,7 +42,7 @@ if(CMAKE_COMPILER_2005) endif(CMAKE_COMPILER_2005) add_definitions(-DHAVE_CONFIG_H -DCURL_STATICLIB) - +option(CURL_SKIP_EXAMPLES "Skip building the curl examples" FALSE) add_subdirectory(lib) add_subdirectory(src) add_subdirectory(docs) diff --git a/Utilities/cmcurl-7.19.0/docs/CMakeLists.txt b/Utilities/cmcurl-7.19.0/docs/CMakeLists.txt index 2d2cfee..5b7c064 100644 --- a/Utilities/cmcurl-7.19.0/docs/CMakeLists.txt +++ b/Utilities/cmcurl-7.19.0/docs/CMakeLists.txt @@ -1 +1,4 @@ -add_subdirectory(examples) +if(NOT CURL_SKIP_EXAMPLES) + add_subdirectory(examples) +endif(NOT CURL_SKIP_EXAMPLES) + diff --git a/Utilities/cmcurl-7.19.0/include/curl/curl.h b/Utilities/cmcurl-7.19.0/include/curl/curl.h index c9a7635..8ce31fa 100644 --- a/Utilities/cmcurl-7.19.0/include/curl/curl.h +++ b/Utilities/cmcurl-7.19.0/include/curl/curl.h @@ -32,7 +32,7 @@ */ #include "curlver.h" /* libcurl version defines */ -#include "curl/curlbuild.h" /* libcurl build definitions */ +#include "cmcurl-7.19.0/include/curl/curlbuild.h" /* libcurl build definitions */ #include "curlrules.h" /* libcurl rules enforcement */ /* diff --git a/Utilities/cmcurl-7.19.0/lib/CMakeLists.txt b/Utilities/cmcurl-7.19.0/lib/CMakeLists.txt index 99e2314..4b01adb 100644 --- a/Utilities/cmcurl-7.19.0/lib/CMakeLists.txt +++ b/Utilities/cmcurl-7.19.0/lib/CMakeLists.txt @@ -564,7 +564,6 @@ configure_file(${CURL_SOURCE_DIR}/lib/config.cmake.h.in set(CURL_SIZEOF_LONG ${SIZEOF_LONG}) configure_file(${CURL_SOURCE_DIR}/include/curl/curlbuild.cmake.h.in ${CURL_BINARY_DIR}/include/curl/curlbuild.h) - add_library(cmcurl ${libCurl_SRCS}) target_link_libraries(cmcurl ${CURL_LIBS}) |