diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-30 13:11:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-10 15:13:37 (GMT) |
| commit | 19593042959274fab45f6bc0ef77d6ddc4532a0f (patch) | |
| tree | 48d2ac9e1b1bc32729981f2dd72f9825c6c8cfd3 /Utilities/cmcurl/lib | |
| parent | cf54aebb968aa66b0990174db8b73c405f6e9c98 (diff) | |
| download | CMake-19593042959274fab45f6bc0ef77d6ddc4532a0f.zip CMake-19593042959274fab45f6bc0ef77d6ddc4532a0f.tar.gz CMake-19593042959274fab45f6bc0ef77d6ddc4532a0f.tar.bz2 | |
curl: Configure build to work within CMake
Set curl build options as needed for CMake rather than presenting them
to the user in the cache. Drop the CMAKE_BUILD_CURL_SHARED option for
now.
Change the curl library name to 'cmcurl'. Disable blocks of code within
curl CMakeLists.txt files that we do not need for CMake, but leave the
code in place to make merging with curl updates easier.
Diffstat (limited to 'Utilities/cmcurl/lib')
| -rw-r--r-- | Utilities/cmcurl/lib/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Utilities/cmcurl/lib/CMakeLists.txt b/Utilities/cmcurl/lib/CMakeLists.txt index 3d5c3e3..6188ddb 100644 --- a/Utilities/cmcurl/lib/CMakeLists.txt +++ b/Utilities/cmcurl/lib/CMakeLists.txt @@ -1,4 +1,4 @@ -set(LIB_NAME libcurl) +set(LIB_NAME cmcurl) configure_file(${CURL_SOURCE_DIR}/include/curl/curlbuild.h.cmake ${CURL_BINARY_DIR}/include/curl/curlbuild.h) @@ -96,14 +96,17 @@ add_library( target_link_libraries(${LIB_NAME} ${CURL_LIBS}) +if(0) # This code not needed for building within CMake. if(WIN32) add_definitions( -D_USRDLL ) endif() +endif() set_target_properties(${LIB_NAME} PROPERTIES COMPILE_DEFINITIONS BUILDING_LIBCURL) setup_curl_dependencies(${LIB_NAME}) +if(0) # This code not needed for building within CMake. # Remove the "lib" prefix since the library is already named "libcurl". set_target_properties(${LIB_NAME} PROPERTIES PREFIX "") set_target_properties(${LIB_NAME} PROPERTIES IMPORT_PREFIX "") @@ -116,3 +119,4 @@ if(WIN32) endif() install(TARGETS ${LIB_NAME} DESTINATION lib) +endif() |