summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-06-07 16:59:34 +0000
committerng0 <ng0@n0.is>2019-06-07 16:59:34 +0000
commitbc31e1fa180d75fe68fa5fbd82cdade68b80c8b7 (patch)
tree344e057479a9c113742c5a4a54d3163664be7e30
parent5d5e1c7388053975f57ff9ecc4cd1d7347526df0 (diff)
downloadgnurl-bc31e1fa180d75fe68fa5fbd82cdade68b80c8b7.tar.gz
gnurl-bc31e1fa180d75fe68fa5fbd82cdade68b80c8b7.tar.bz2
gnurl-bc31e1fa180d75fe68fa5fbd82cdade68b80c8b7.zip
tiny changes in CMake.
-rw-r--r--CMakeLists.txt40
-rw-r--r--tests/libtest/CMakeLists.txt2
2 files changed, 21 insertions, 21 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c0d082eb..6739b0de6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,7 @@ string(REGEX REPLACE "[^0]+0x" "" CURL_VERSION_NUM ${CURL_VERSION_NUM})
# Setup package meta-data
# SET(PACKAGE "curl")
-message(STATUS "curl version=[${CURL_VERSION}]")
+message(STATUS "gnurl version=[${CURL_VERSION}]")
# SET(PACKAGE_TARNAME "curl")
# SET(PACKAGE_NAME "curl")
# SET(PACKAGE_VERSION "-")
@@ -130,35 +130,35 @@ include(CurlSymbolHiding)
option(HTTP_ONLY "disables all protocols except HTTP (This overrides all CURL_DISABLE_* options)" OFF)
mark_as_advanced(HTTP_ONLY)
-option(CURL_DISABLE_FTP "disables FTP" OFF)
+option(CURL_DISABLE_FTP "disables FTP" ON)
mark_as_advanced(CURL_DISABLE_FTP)
-option(CURL_DISABLE_LDAP "disables LDAP" OFF)
+option(CURL_DISABLE_LDAP "disables LDAP" ON)
mark_as_advanced(CURL_DISABLE_LDAP)
-option(CURL_DISABLE_TELNET "disables Telnet" OFF)
+option(CURL_DISABLE_TELNET "disables Telnet" ON)
mark_as_advanced(CURL_DISABLE_TELNET)
-option(CURL_DISABLE_DICT "disables DICT" OFF)
+option(CURL_DISABLE_DICT "disables DICT" ON)
mark_as_advanced(CURL_DISABLE_DICT)
-option(CURL_DISABLE_FILE "disables FILE" OFF)
+option(CURL_DISABLE_FILE "disables FILE" ON)
mark_as_advanced(CURL_DISABLE_FILE)
-option(CURL_DISABLE_TFTP "disables TFTP" OFF)
+option(CURL_DISABLE_TFTP "disables TFTP" ON)
mark_as_advanced(CURL_DISABLE_TFTP)
-option(CURL_DISABLE_HTTP "disables HTTP" OFF)
+option(CURL_DISABLE_HTTP "disables HTTP" ON)
mark_as_advanced(CURL_DISABLE_HTTP)
-option(CURL_DISABLE_LDAPS "to disable LDAPS" OFF)
+option(CURL_DISABLE_LDAPS "to disable LDAPS" ON)
mark_as_advanced(CURL_DISABLE_LDAPS)
-option(CURL_DISABLE_RTSP "to disable RTSP" OFF)
+option(CURL_DISABLE_RTSP "to disable RTSP" ON)
mark_as_advanced(CURL_DISABLE_RTSP)
option(CURL_DISABLE_PROXY "to disable proxy" OFF)
mark_as_advanced(CURL_DISABLE_PROXY)
-option(CURL_DISABLE_POP3 "to disable POP3" OFF)
+option(CURL_DISABLE_POP3 "to disable POP3" ON)
mark_as_advanced(CURL_DISABLE_POP3)
-option(CURL_DISABLE_IMAP "to disable IMAP" OFF)
+option(CURL_DISABLE_IMAP "to disable IMAP" ON)
mark_as_advanced(CURL_DISABLE_IMAP)
-option(CURL_DISABLE_SMTP "to disable SMTP" OFF)
+option(CURL_DISABLE_SMTP "to disable SMTP" ON)
mark_as_advanced(CURL_DISABLE_SMTP)
-option(CURL_DISABLE_GOPHER "to disable Gopher" OFF)
+option(CURL_DISABLE_GOPHER "to disable Gopher" ON)
mark_as_advanced(CURL_DISABLE_GOPHER)
if(HTTP_ONLY)
@@ -1297,9 +1297,9 @@ set(VERSIONNUM "${CURL_VERSION_NUM}")
# Use:
# * ENABLE_SHARED
# * ENABLE_STATIC
-configure_file("${CURL_SOURCE_DIR}/curl-config.in"
- "${CURL_BINARY_DIR}/curl-config" @ONLY)
-install(FILES "${CURL_BINARY_DIR}/curl-config"
+configure_file("${CURL_SOURCE_DIR}/gnurl-config.in"
+ "${CURL_BINARY_DIR}/gnurl-config" @ONLY)
+install(FILES "${CURL_BINARY_DIR}/gnurl-config"
DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS
OWNER_READ OWNER_WRITE OWNER_EXECUTE
@@ -1307,9 +1307,9 @@ install(FILES "${CURL_BINARY_DIR}/curl-config"
WORLD_READ WORLD_EXECUTE)
# Finally generate a pkg-config file matching this config
-configure_file("${CURL_SOURCE_DIR}/libcurl.pc.in"
- "${CURL_BINARY_DIR}/libcurl.pc" @ONLY)
-install(FILES "${CURL_BINARY_DIR}/libcurl.pc"
+configure_file("${CURL_SOURCE_DIR}/libgnurl.pc.in"
+ "${CURL_BINARY_DIR}/libgnurl.pc" @ONLY)
+install(FILES "${CURL_BINARY_DIR}/libgnurl.pc"
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
# install headers
diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt
index d74081f70..88b571b76 100644
--- a/tests/libtest/CMakeLists.txt
+++ b/tests/libtest/CMakeLists.txt
@@ -18,7 +18,7 @@ function(setup_test TEST_NAME) # ARGN are the files in the test
include_directories(${CARES_INCLUDE_DIR})
endif()
- target_link_libraries(${TEST_NAME} libcurl ${CURL_LIBS})
+ target_link_libraries(${TEST_NAME} libgnurl ${CURL_LIBS})
set_target_properties(${TEST_NAME}
PROPERTIES COMPILE_DEFINITIONS ${UPPER_TEST_NAME})