diff options
| author | Sergei Nikulov <sergey.nikulov@gmail.com> | 2018-05-24 00:37:53 +0300 |
|---|---|---|
| committer | Sergei Nikulov <snikulov@users.noreply.github.com> | 2018-05-24 17:25:41 +0300 |
| commit | 2c0225e0423eea2c76e68f50c766b112d1303d92 (patch) | |
| tree | 71ccd5f3256ef054efece25da0ba6e6b48991dda | |
| parent | d353af001420574210605ba132dfd31a0e3876a5 (diff) | |
| download | curl-2c0225e0423eea2c76e68f50c766b112d1303d92.tar.gz | |
cmake: set -d postfix for debug builds if not specified
using -DCMAKE_DEBUG_POSTFIX explicitly
fixes #2121, obsoletes #2384
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | lib/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/libtest/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/server/CMakeLists.txt | 6 |
5 files changed, 3 insertions, 24 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bf25b1f79..b8c79f88a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,7 +118,9 @@ if (ENABLE_CURLDEBUG) endif() # For debug libs and exes, add "-d" postfix -set(CMAKE_DEBUG_POSTFIX "-d" CACHE STRING "Set debug library postfix") +if(NOT DEFINED CMAKE_DEBUG_POSTFIX) + set(CMAKE_DEBUG_POSTFIX "-d") +endif() # initialize CURL_LIBS set(CURL_LIBS "") diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 1fabdba90..6653d555f 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -98,13 +98,6 @@ 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() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 30c525c44..7e87f75e6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -70,10 +70,6 @@ target_link_libraries( ${EXE_NAME} libcurl ${CURL_LIBS}) #SET_TARGET_PROPERTIES(${EXE_NAME} RUNTIME_OUTPUT_DIRECTORY "blah blah blah") #SET_TARGET_PROPERTIES(${EXE_NAME} LIBRARY_OUTPUT_DIRECTORY "blah blah blah") -# Add the postfix to the executable since it is not added automatically as for modules and shared libraries -set_target_properties(${EXE_NAME} PROPERTIES - DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") - #INCLUDE(ModuleInstall OPTIONAL) install(TARGETS ${EXE_NAME} EXPORT curl-target DESTINATION bin) diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt index 4d42aa513..6211aaae4 100644 --- a/tests/libtest/CMakeLists.txt +++ b/tests/libtest/CMakeLists.txt @@ -20,12 +20,6 @@ function(SETUP_TEST TEST_NAME) # ARGN are the files in the test PROPERTIES COMPILE_DEFINITIONS ${UPPER_TEST_NAME}) set_target_properties(${TEST_NAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL_PREFIX}${TEST_NAME}") - - # Add the postfix to the executable since it is - # not added automatically as for modules and shared libraries - set_target_properties(${TEST_NAME} - PROPERTIES DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") - endfunction() diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt index 73841027b..59716fbb3 100644 --- a/tests/server/CMakeLists.txt +++ b/tests/server/CMakeLists.txt @@ -31,12 +31,6 @@ function(SETUP_EXECUTABLE TEST_NAME) # ARGN are the files in the test endif() set_target_properties(${TEST_NAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL_PREFIX}${TEST_NAME}") - - # Add the postfix to the executable since it is not added - # automatically as for modules and shared libraries - set_target_properties(${TEST_NAME} PROPERTIES - DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") - endfunction() |