added POCO_NO_SHARED_LIBRARY_DEBUG_SUFFIX configuration macro to disable *d.so, *d.dll suffix in SharedLibrary class

This commit is contained in:
Guenter Obiltschnig
2016-10-10 12:07:58 +02:00
parent e2bfe6f2cf
commit 8888d3daae
6 changed files with 19 additions and 9 deletions

View File

@@ -9,7 +9,7 @@
//
// Feature configuration for the POCO libraries.
//
// Copyright (c) 2006-2010, Applied Informatics Software Engineering GmbH.
// Copyright (c) 2006-2016, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
@@ -93,8 +93,10 @@
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//
#ifndef POCO_NO_SOO
#ifndef POCO_ENABLE_SOO
#define POCO_NO_SOO
#endif
#endif
@@ -168,13 +170,21 @@
#define POCO_NO_LOCALE
#endif
// Enable the poco_debug_* and poco_trace_* macros
// even if the _DEBUG variable is not set.
// This allows the use of these macros in a release version.
// #define POCO_LOG_DEBUG
// Uncomment to disable the use of bundled OpenSSL binaries
// (Windows only)
// #define POCO_EXTERNAL_OPENSSL
// Define to prevent changing the suffix for shared libraries
// to "d.so", "d.dll", etc. for _DEBUG builds in Poco::SharedLibrary.
// #define POCO_NO_SHARED_LIBRARY_DEBUG_SUFFIX
#endif // Foundation_Config_INCLUDED

View File

@@ -91,7 +91,7 @@ std::string SharedLibraryImpl::prefixImpl()
std::string SharedLibraryImpl::suffixImpl()
{
#if defined(_DEBUG)
#if defined(_DEBUG) && !defined(POCO_NO_SHARED_LIBRARY_DEBUG_SUFFIX)
return "d.sl";
#else
return ".sl";

View File

@@ -112,25 +112,25 @@ std::string SharedLibraryImpl::prefixImpl()
std::string SharedLibraryImpl::suffixImpl()
{
#if POCO_OS == POCO_OS_MAC_OS_X
#if defined(_DEBUG)
#if defined(_DEBUG) && !defined(POCO_NO_SHARED_LIBRARY_DEBUG_SUFFIX)
return "d.dylib";
#else
return ".dylib";
#endif
#elif POCO_OS == POCO_OS_HPUX
#if defined(_DEBUG)
#if defined(_DEBUG) && !defined(POCO_NO_SHARED_LIBRARY_DEBUG_SUFFIX)
return "d.sl";
#else
return ".sl";
#endif
#elif POCO_OS == POCO_OS_CYGWIN
#if defined(_DEBUG)
#if defined(_DEBUG) && !defined(POCO_NO_SHARED_LIBRARY_DEBUG_SUFFIX)
return "d.dll";
#else
return ".dll";
#endif
#else
#if defined(_DEBUG)
#if defined(_DEBUG) && !defined(POCO_NO_SHARED_LIBRARY_DEBUG_SUFFIX)
return "d.so";
#else
return ".so";

View File

@@ -114,7 +114,7 @@ std::string SharedLibraryImpl::prefixImpl()
std::string SharedLibraryImpl::suffixImpl()
{
#if defined(_DEBUG)
#if defined(_DEBUG) && !defined(POCO_NO_SHARED_LIBRARY_DEBUG_SUFFIX)
return "d.exe";
#else
return ".exe";

View File

@@ -95,7 +95,7 @@ std::string SharedLibraryImpl::prefixImpl()
std::string SharedLibraryImpl::suffixImpl()
{
#if defined(_DEBUG)
#if defined(_DEBUG) && !defined(POCO_NO_SHARED_LIBRARY_DEBUG_SUFFIX)
return "d.dll";
#else
return ".dll";

View File

@@ -106,7 +106,7 @@ std::string SharedLibraryImpl::prefixImpl()
std::string SharedLibraryImpl::suffixImpl()
{
#if defined(_DEBUG)
#if defined(_DEBUG) && !defined(POCO_NO_SHARED_LIBRARY_DEBUG_SUFFIX)
return "d.dll";
#else
return ".dll";