Fix unity build

fixes #7433

diff --git a/lib/cli/CMakeLists.txt b/lib/cli/CMakeLists.txt
index 70063400e58eb9900702a2b6b3ec09c93ea24895..fd6006945be37fc0bca080750e56be6860e16863 100644 (file)
--- a/lib/cli/CMakeLists.txt
+++ b/lib/cli/CMakeLists.txt
@@ -24,9 +24,8 @@ set(cli_SOURCES
   objectlistcommand.cpp
   pkinewcacommand.cpp pkinewcertcommand.cpp pkisigncsrcommand.cpp pkirequestcommand.cpp pkisavecertcommand.cpp pkiticketcommand.cpp
   pkiutility.cpp
-  repositoryobjectcommand.cpp
-  variablegetcommand.cpp variablelistcommand.cpp
   repositorycommitcommand.cpp repositoryobjectcommand.cpp repositoryutility.cpp
+  variablegetcommand.cpp variablelistcommand.cpp
 )
 
 if(ICINGA2_UNITY_BUILD)

diff --git a/lib/cli/agentblackandwhitelistcommand.hpp b/lib/cli/agentblackandwhitelistcommand.hpp
index 656c61d394ab65868c59a73de3c3e77e68fbecd1..921dec5276e1e2759790c9640aebdd60c8c71ce4 100644 (file)
--- a/lib/cli/agentblackandwhitelistcommand.hpp
+++ b/lib/cli/agentblackandwhitelistcommand.hpp
@@ -67,7 +67,7 @@ public:
 };
 
 #define REGISTER_BLACKANDWHITELIST_CLICOMMAND(type) \
-       namespace { namespace UNIQUE_NAME(cli) { \
+       namespace { namespace UNIQUE_NAME(blackandwhitelist) { \
                I2_EXPORT icinga::RegisterBlackAndWhitelistCLICommandHelper l_RegisterBlackAndWhitelistCLICommand(type); \
        } }
 

diff --git a/lib/cli/repositoryobjectcommand.hpp b/lib/cli/repositoryobjectcommand.hpp
index 4501f5e17bb3587eed92197f1cfc4c9b706f5a13..4b9f833970d83ba63a6312adfdc20e1b96b6d570 100644 (file)
--- a/lib/cli/repositoryobjectcommand.hpp
+++ b/lib/cli/repositoryobjectcommand.hpp
@@ -69,7 +69,7 @@ public:
 };
 
 #define REGISTER_REPOSITORY_CLICOMMAND(type) \
-       namespace { namespace UNIQUE_NAME(cli) { \
+       namespace { namespace UNIQUE_NAME(repositoryobject) { \
                I2_EXPORT icinga::RegisterRepositoryCLICommandHelper l_RegisterRepositoryCLICommand(type); \
        } }