Fix decoration for static builds
This commit is contained in:
parent
a628f0383a
commit
0b9a0fe326
|
@ -0,0 +1,17 @@
|
||||||
|
// Created via CMake from template global.h.in
|
||||||
|
// WARNING! Any changes to this file will be overwritten by the next CMake run!
|
||||||
|
|
||||||
|
#ifndef PASSWORD_FILE_GLOBAL
|
||||||
|
#define PASSWORD_FILE_GLOBAL
|
||||||
|
|
||||||
|
#include <c++utilities/application/global.h>
|
||||||
|
|
||||||
|
#ifdef PASSWORD_FILE_STATIC
|
||||||
|
# define PASSWORD_FILE_EXPORT
|
||||||
|
# define PASSWORD_FILE_IMPORT
|
||||||
|
#else
|
||||||
|
# define PASSWORD_FILE_EXPORT LIB_EXPORT
|
||||||
|
# define PASSWORD_FILE_IMPORT LIB_IMPORT
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif // PASSWORD_FILE_GLOBAL
|
|
@ -1,14 +1,14 @@
|
||||||
#ifndef CRYPTOFAILUREEXCEPTION_H
|
#ifndef CRYPTOFAILUREEXCEPTION_H
|
||||||
#define CRYPTOFAILUREEXCEPTION_H
|
#define CRYPTOFAILUREEXCEPTION_H
|
||||||
|
|
||||||
#include <c++utilities/application/global.h>
|
#include "../global.h"
|
||||||
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
namespace Io {
|
namespace Io {
|
||||||
|
|
||||||
class LIB_EXPORT CryptoException : public std::runtime_error
|
class PASSWORD_FILE_EXPORT CryptoException : public std::runtime_error
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
CryptoException(const std::string &openSslErrorQueue) USE_NOTHROW;
|
CryptoException(const std::string &openSslErrorQueue) USE_NOTHROW;
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
#include "./field.h"
|
#include "./field.h"
|
||||||
|
|
||||||
#include <c++utilities/conversion/types.h>
|
#include <c++utilities/conversion/types.h>
|
||||||
#include <c++utilities/application/global.h>
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
@ -24,7 +23,7 @@ enum class EntryType : int
|
||||||
|
|
||||||
class NodeEntry;
|
class NodeEntry;
|
||||||
|
|
||||||
class LIB_EXPORT Entry
|
class PASSWORD_FILE_EXPORT Entry
|
||||||
{
|
{
|
||||||
friend class NodeEntry;
|
friend class NodeEntry;
|
||||||
public:
|
public:
|
||||||
|
@ -95,7 +94,7 @@ inline int Entry::index() const
|
||||||
return m_index;
|
return m_index;
|
||||||
}
|
}
|
||||||
|
|
||||||
class LIB_EXPORT NodeEntry : public Entry
|
class PASSWORD_FILE_EXPORT NodeEntry : public Entry
|
||||||
{
|
{
|
||||||
friend class Entry;
|
friend class Entry;
|
||||||
public:
|
public:
|
||||||
|
@ -145,7 +144,7 @@ inline bool Entry::denotesNodeEntry(byte version)
|
||||||
return (version & 0x80) == 0;
|
return (version & 0x80) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
class LIB_EXPORT AccountEntry : public Entry
|
class PASSWORD_FILE_EXPORT AccountEntry : public Entry
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
AccountEntry();
|
AccountEntry();
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef FIELD_H
|
#ifndef FIELD_H
|
||||||
#define FIELD_H
|
#define FIELD_H
|
||||||
|
|
||||||
#include <c++utilities/application/global.h>
|
#include "../global.h"
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
@ -16,7 +16,7 @@ enum class FieldType : int
|
||||||
|
|
||||||
class AccountEntry;
|
class AccountEntry;
|
||||||
|
|
||||||
class LIB_EXPORT Field
|
class PASSWORD_FILE_EXPORT Field
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
Field(AccountEntry *tiedAccount, const std::string &name = std::string(), const std::string &value = std::string());
|
Field(AccountEntry *tiedAccount, const std::string &name = std::string(), const std::string &value = std::string());
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
#ifndef PARSINGEXCEPTION_H
|
#ifndef PARSINGEXCEPTION_H
|
||||||
#define PARSINGEXCEPTION_H
|
#define PARSINGEXCEPTION_H
|
||||||
|
|
||||||
#include <c++utilities/application/global.h>
|
#include "../global.h"
|
||||||
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
namespace Io {
|
namespace Io {
|
||||||
|
|
||||||
class LIB_EXPORT ParsingException : public std::runtime_error
|
class PASSWORD_FILE_EXPORT ParsingException : public std::runtime_error
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ParsingException(const std::string &message = std::string()) USE_NOTHROW;
|
ParsingException(const std::string &message = std::string()) USE_NOTHROW;
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
#ifndef PASSWORDFILE_H
|
#ifndef PASSWORDFILE_H
|
||||||
#define PASSWORDFILE_H
|
#define PASSWORDFILE_H
|
||||||
|
|
||||||
|
#include "../global.h"
|
||||||
|
|
||||||
#include <c++utilities/io/binaryreader.h>
|
#include <c++utilities/io/binaryreader.h>
|
||||||
#include <c++utilities/io/binarywriter.h>
|
#include <c++utilities/io/binarywriter.h>
|
||||||
|
|
||||||
|
@ -13,7 +15,7 @@ namespace Io {
|
||||||
|
|
||||||
class NodeEntry;
|
class NodeEntry;
|
||||||
|
|
||||||
class LIB_EXPORT PasswordFile
|
class PASSWORD_FILE_EXPORT PasswordFile
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit PasswordFile();
|
explicit PasswordFile();
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
#include "../io/entry.h"
|
#include "../io/entry.h"
|
||||||
|
|
||||||
#include <c++utilities/tests/testutils.h>
|
#include <c++utilities/tests/testutils.h>
|
||||||
#include <c++utilities/application/global.h>
|
|
||||||
|
|
||||||
#include <cppunit/extensions/HelperMacros.h>
|
#include <cppunit/extensions/HelperMacros.h>
|
||||||
#include <cppunit/TestFixture.h>
|
#include <cppunit/TestFixture.h>
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
#ifndef OPENSSL_H
|
#ifndef OPENSSL_H
|
||||||
#define OPENSSL_H
|
#define OPENSSL_H
|
||||||
|
|
||||||
#include <c++utilities/application/global.h>
|
#include "../global.h"
|
||||||
|
|
||||||
namespace Util {
|
namespace Util {
|
||||||
|
|
||||||
namespace OpenSsl {
|
namespace OpenSsl {
|
||||||
|
|
||||||
void LIB_EXPORT init();
|
void PASSWORD_FILE_EXPORT init();
|
||||||
void LIB_EXPORT clean();
|
void PASSWORD_FILE_EXPORT clean();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
#ifndef OPENSSLRANDOMDEVICE_H
|
#ifndef OPENSSLRANDOMDEVICE_H
|
||||||
#define OPENSSLRANDOMDEVICE_H
|
#define OPENSSLRANDOMDEVICE_H
|
||||||
|
|
||||||
|
#include "../global.h"
|
||||||
|
|
||||||
#include <c++utilities/conversion/types.h>
|
#include <c++utilities/conversion/types.h>
|
||||||
#include <c++utilities/application/global.h>
|
|
||||||
|
|
||||||
namespace Util {
|
namespace Util {
|
||||||
|
|
||||||
class LIB_EXPORT OpenSslRandomDevice
|
class PASSWORD_FILE_EXPORT OpenSslRandomDevice
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
OpenSslRandomDevice();
|
OpenSslRandomDevice();
|
||||||
|
|
Loading…
Reference in New Issue