diff options
| author | Jakub Zakrzewski <slither.jz@gmail.com> | 2019-04-07 12:05:23 +0200 |
|---|---|---|
| committer | Jakub Zakrzewski <slither.jz@gmail.com> | 2019-04-10 19:12:28 +0200 |
| commit | 639cfeb0f8f0f869d9cdd3756f72935f382b179a (patch) | |
| tree | 4af879c3179917c421161974747efc8e8ce229d4 | |
| parent | c4e0be44089408d65220ab0174ad3443724092a0 (diff) | |
| download | curl-639cfeb0f8f0f869d9cdd3756f72935f382b179a.tar.gz | |
cmake: minor cleanup
- Remove nneeded include_regular_expression.
It was setting what is already a default.
- Remove duplicated include.
- Don't check for pre-3.0.0 CMake version.
We already require at least 3.0.0, so it's just clutter.
Ref: #3744
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 783b619ef..abcae6153 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,6 @@ string(REGEX MATCH "#define LIBCURL_VERSION_NUM 0x[0-9a-fA-F]+" CURL_VERSION_NUM ${CURL_VERSION_H_CONTENTS}) string(REGEX REPLACE "[^0]+0x" "" CURL_VERSION_NUM ${CURL_VERSION_NUM}) -include_regular_expression("^.*$") # Sukender: Is it necessary? # Setup package meta-data # SET(PACKAGE "curl") @@ -104,11 +103,7 @@ endif() if(ENABLE_DEBUG) # DEBUGBUILD will be defined only for Debug builds - if(NOT CMAKE_VERSION VERSION_LESS 3.0) - set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:Debug>:DEBUGBUILD>) - else() - set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUGBUILD) - endif() + set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:Debug>:DEBUGBUILD>) set(ENABLE_CURLDEBUG ON) endif() @@ -246,7 +241,6 @@ include(CheckLibraryExists) include(CheckSymbolExists) include(CheckTypeSize) include(CheckCSourceCompiles) -include(CMakeDependentOption) # On windows preload settings if(WIN32) |