[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 28/163: cmake: set -d postfix for debug builds if n
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 28/163: cmake: set -d postfix for debug builds if not specified using -DCMAKE_DEBUG_POSTFIX explicitly |
Date: |
Sun, 05 Aug 2018 12:35:54 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 2c0225e0423eea2c76e68f50c766b112d1303d92
Author: Sergei Nikulov <address@hidden>
AuthorDate: Thu May 24 00:37:53 2018 +0300
cmake: set -d postfix for debug builds if not specified
using -DCMAKE_DEBUG_POSTFIX explicitly
fixes #2121, obsoletes #2384
---
CMakeLists.txt | 4 +++-
lib/CMakeLists.txt | 7 -------
src/CMakeLists.txt | 4 ----
tests/libtest/CMakeLists.txt | 6 ------
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()
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 06/163: bump: start working on the pending 7.61.0, (continued)
- [GNUnet-SVN] [gnurl] 06/163: bump: start working on the pending 7.61.0, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 20/163: KNOWN_BUGS: mention the -O with %-encoded file names, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 22/163: CURLOPT_ACCEPT_ENCODING.3: add brotli and clarify a bit, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 11/163: docs: mention HAproxy protocol "version 1", gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 16/163: configure: compile-time SIZEOF checks, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 34/163: winbuild: In MakefileBuild.vc fix typo DISTDIR->DIRDIST, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 18/163: curl: added --styled-output, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 14/163: docs: clarify CURLOPT_HTTPGET somewhat, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 24/163: configure: add missing m4/ax_compile_check_sizeof.m4, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 21/163: RELEASE-NOTES: synced, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 28/163: cmake: set -d postfix for debug builds if not specified using -DCMAKE_DEBUG_POSTFIX explicitly,
gnunet <=
- [GNUnet-SVN] [gnurl] 53/163: os400: sync EBCDIC wrappers and ILE/RPG binding with latest options, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 32/163: content_encoding: handle zlib versions too old for Z_BLOCK, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 38/163: mailmap: Max Savenkov, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 31/163: multi: provide a socket to wait for in Curl_protocol_getsock, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 41/163: cmdline-opts/gen.pl: warn if mutexes: or see-also: list non-existing options, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 44/163: configure: fix ssh2 linking when built with a static mbedtls, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 67/163: curl_addrinfo: use same #ifdef conditions in source as header, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 33/163: winbuild: only delete OUTFILE if it exists, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 36/163: mailmap: a Richard Alcock fixup, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 17/163: curl: show headers in bold, gnunet, 2018/08/05