diff options
| author | Paul Harris <paulharris@computer.org> | 2017-07-06 23:53:41 +0800 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-07-07 14:29:26 +0200 |
| commit | 45f39945ec929f9ac725c318c8657e4b920c22c5 (patch) | |
| tree | 49ab56bc30220ef933d2028e9176362b2a45162b | |
| parent | bbc9c6d1445e971706801f9e1077330213993e01 (diff) | |
| download | curl-45f39945ec929f9ac725c318c8657e4b920c22c5.tar.gz | |
cmake: offer CMAKE_DEBUG_POSTFIX when building with MSVC
Removes BUILD_RELEASE_DEBUG_DIRS since it wasn't used anywhere.
Closes #1649
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | lib/CMakeLists.txt | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 25d8fd8f0..8646c6adc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,6 +104,9 @@ if (ENABLE_CURLDEBUG) set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS CURLDEBUG) endif() +# For debug libs and exes, add "-d" postfix +set(CMAKE_DEBUG_POSTFIX "-d" CACHE STRING "Set debug library postfix" FORCE) + # initialize CURL_LIBS set(CURL_LIBS "") @@ -118,11 +121,6 @@ if(ENABLE_ARES) set(CURL_LIBS ${CURL_LIBS} ${CARES_LIBRARY}) endif() -if(MSVC) - option(BUILD_RELEASE_DEBUG_DIRS "Set OFF to build each configuration to a separate directory" OFF) - mark_as_advanced(BUILD_RELEASE_DEBUG_DIRS) -endif() - include(CurlSymbolHiding) option(HTTP_ONLY "disables all protocols except HTTP (This overrides all CURL_DISABLE_* options)" OFF) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index f6dcbbc31..667754480 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -97,6 +97,13 @@ if(WIN32) if(NOT CURL_STATICLIB) # Add "_imp" as a suffix before the extension to avoid conflicting with the statically linked "libcurl.lib" set_target_properties(${LIB_NAME} PROPERTIES IMPORT_SUFFIX "_imp.lib") + + set_target_properties (${LIB_NAME} PROPERTIES + DEBUG_POSTFIX "-d" + # Note: no postfix for release variants, let user choose what style of release he wants + # MINSIZEREL_POSTFIX "-z" + # RELWITHDEBINFO_POSTFIX "-g" + ) endif() endif() |