generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 11:06:50 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
Foundation/include/Poco/Config.h
View File

@@ -9,7 +9,7 @@
// //
// Feature configuration for the POCO libraries. // 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. // and Contributors.
// //
// SPDX-License-Identifier: BSL-1.0 // SPDX-License-Identifier: BSL-1.0
@@ -93,8 +93,10 @@
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// //
#ifndef POCO_NO_SOO #ifndef POCO_NO_SOO
#ifndef POCO_ENABLE_SOO
#define POCO_NO_SOO #define POCO_NO_SOO
#endif #endif
#endif
@@ -168,13 +170,21 @@
#define POCO_NO_LOCALE #define POCO_NO_LOCALE
#endif #endif
// Enable the poco_debug_* and poco_trace_* macros // Enable the poco_debug_* and poco_trace_* macros
// even if the _DEBUG variable is not set. // even if the _DEBUG variable is not set.
// This allows the use of these macros in a release version. // This allows the use of these macros in a release version.
// #define POCO_LOG_DEBUG // #define POCO_LOG_DEBUG
// Uncomment to disable the use of bundled OpenSSL binaries // Uncomment to disable the use of bundled OpenSSL binaries
// (Windows only) // (Windows only)
// #define POCO_EXTERNAL_OPENSSL // #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 #endif // Foundation_Config_INCLUDED

2
Foundation/src/SharedLibrary_HPUX.cpp
View File

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

8
Foundation/src/SharedLibrary_UNIX.cpp
View File

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

2
Foundation/src/SharedLibrary_VMS.cpp
View File

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

2
Foundation/src/SharedLibrary_WIN32.cpp
View File

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

2
Foundation/src/SharedLibrary_WIN32U.cpp
View File

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