generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-19 08:46:41 +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 11:56:58 +02:00
parent 18eee84793
commit 59a78a55b5
7 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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
@ -90,7 +90,9 @@
// !!! for std::aligned_storage. !!! // !!! for std::aligned_storage. !!!
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// //
#ifndef POCO_ENABLE_SOO
#define POCO_NO_SOO #define POCO_NO_SOO
#endif
// Small object size in bytes. When assigned to Any or Var, // Small object size in bytes. When assigned to Any or Var,
@ -163,9 +165,16 @@
#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
// 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

4
Foundation/include/Poco/SharedLibrary.h
View File

@ -122,7 +122,9 @@ public:
/// Returns the platform-specific filename suffix /// Returns the platform-specific filename suffix
/// for shared libraries (including the period). /// for shared libraries (including the period).
/// In debug mode, the suffix also includes a /// In debug mode, the suffix also includes a
/// "d" to specify the debug version of a library. /// "d" to specify the debug version of a library
/// (e.g., "d.so", "d.dll") unless the library has
/// been compiled with -DPOCO_NO_SHARED_LIBRARY_DEBUG_SUFFIX.
private: private:
SharedLibrary(const SharedLibrary&); SharedLibrary(const SharedLibrary&);

2
Foundation/src/SharedLibrary_HPUX.cpp
View File

@ -85,7 +85,7 @@ const std::string& SharedLibraryImpl::getPathImpl() const
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

@ -102,25 +102,25 @@ const std::string& SharedLibraryImpl::getPathImpl() const
std::string SharedLibraryImpl::suffixImpl() std::string SharedLibraryImpl::suffixImpl()
{ {
#if defined(__APPLE__) #if defined(__APPLE__)
#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 defined(hpux) || defined(_hpux) #elif defined(hpux) || defined(_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 defined(__CYGWIN__) #elif defined(__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

@ -108,7 +108,7 @@ const std::string& SharedLibraryImpl::getPathImpl() const
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

@ -89,7 +89,7 @@ const std::string& SharedLibraryImpl::getPathImpl() const
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

@ -100,7 +100,7 @@ const std::string& SharedLibraryImpl::getPathImpl() const
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";