Fix unity build

fixes #7433
This commit is contained in:
Michael Friedrich 2014-10-23 18:20:39 +02:00
parent 339d0604e1
commit 70ae037324
3 changed files with 3 additions and 4 deletions

View File

@ -24,9 +24,8 @@ set(cli_SOURCES
objectlistcommand.cpp objectlistcommand.cpp
pkinewcacommand.cpp pkinewcertcommand.cpp pkisigncsrcommand.cpp pkirequestcommand.cpp pkisavecertcommand.cpp pkiticketcommand.cpp pkinewcacommand.cpp pkinewcertcommand.cpp pkisigncsrcommand.cpp pkirequestcommand.cpp pkisavecertcommand.cpp pkiticketcommand.cpp
pkiutility.cpp pkiutility.cpp
repositoryobjectcommand.cpp
variablegetcommand.cpp variablelistcommand.cpp
repositorycommitcommand.cpp repositoryobjectcommand.cpp repositoryutility.cpp repositorycommitcommand.cpp repositoryobjectcommand.cpp repositoryutility.cpp
variablegetcommand.cpp variablelistcommand.cpp
) )
if(ICINGA2_UNITY_BUILD) if(ICINGA2_UNITY_BUILD)

View File

@ -67,7 +67,7 @@ public:
}; };
#define REGISTER_BLACKANDWHITELIST_CLICOMMAND(type) \ #define REGISTER_BLACKANDWHITELIST_CLICOMMAND(type) \
namespace { namespace UNIQUE_NAME(cli) { \ namespace { namespace UNIQUE_NAME(blackandwhitelist) { \
I2_EXPORT icinga::RegisterBlackAndWhitelistCLICommandHelper l_RegisterBlackAndWhitelistCLICommand(type); \ I2_EXPORT icinga::RegisterBlackAndWhitelistCLICommandHelper l_RegisterBlackAndWhitelistCLICommand(type); \
} } } }

View File

@ -69,7 +69,7 @@ public:
}; };
#define REGISTER_REPOSITORY_CLICOMMAND(type) \ #define REGISTER_REPOSITORY_CLICOMMAND(type) \
namespace { namespace UNIQUE_NAME(cli) { \ namespace { namespace UNIQUE_NAME(repositoryobject) { \
I2_EXPORT icinga::RegisterRepositoryCLICommandHelper l_RegisterRepositoryCLICommand(type); \ I2_EXPORT icinga::RegisterRepositoryCLICommandHelper l_RegisterRepositoryCLICommand(type); \
} } } }