Build fix for Windows

diff --git a/lib/cli/CMakeLists.txt b/lib/cli/CMakeLists.txt
index e1cc29afb5a65d0ee0c4897764f316902b3403f7..1e8a87573d6a9b80027dc015493abf196c25db65 100644 (file)
--- a/lib/cli/CMakeLists.txt
+++ b/lib/cli/CMakeLists.txt
@@ -37,6 +37,7 @@ target_link_libraries(cli ${Boost_LIBRARIES} base config remote icinga)
 set_target_properties (
   cli PROPERTIES
   INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/icinga2
+  DEFINE_SYMBOL I2_CLI_BUILD
   FOLDER Lib
 )
 

diff --git a/lib/cli/agentblackandwhitelistcommand.hpp b/lib/cli/agentblackandwhitelistcommand.hpp
index 03ef8fdb4f3c680c943733d75790bc0ba48d49e0..e6a324898873743d64b93559bd1f318b143f1602 100644 (file)
--- a/lib/cli/agentblackandwhitelistcommand.hpp
+++ b/lib/cli/agentblackandwhitelistcommand.hpp
@@ -37,7 +37,7 @@ enum BlackAndWhitelistCommandType
  *
  * @ingroup cli
  */
-class BlackAndWhitelistCommand : public CLICommand
+class I2_CLI_API BlackAndWhitelistCommand : public CLICommand
 {
 public:
        DECLARE_PTR_TYPEDEFS(BlackAndWhitelistCommand);
@@ -60,7 +60,7 @@ private:
  *
  * @ingroup cli
  */
-class I2_BASE_API RegisterBlackAndWhitelistCLICommandHelper
+class I2_CLI_API RegisterBlackAndWhitelistCLICommandHelper
 {
 public:
        RegisterBlackAndWhitelistCLICommandHelper(const String& type);

diff --git a/lib/cli/clicommand.hpp b/lib/cli/clicommand.hpp
index 39c3aa0cbb5dbb331eba6523e8367cbae963ae69..3d41fadcb668a6e800286f3f261d6ccd9cdbabe1 100644 (file)
--- a/lib/cli/clicommand.hpp
+++ b/lib/cli/clicommand.hpp
@@ -20,7 +20,7 @@
 #ifndef CLICOMMAND_H
 #define CLICOMMAND_H
 
-#include "base/i2-base.hpp"
+#include "cli/i2-cli.hpp"
 #include "base/value.hpp"
 #include "base/utility.hpp"
 #include <vector>
@@ -29,15 +29,15 @@
 namespace icinga
 {
 
-I2_BASE_API std::vector<String> GetBashCompletionSuggestions(const String& type, const String& word);
-I2_BASE_API std::vector<String> GetFieldCompletionSuggestions(const Type *type, const String& word);
+std::vector<String> I2_CLI_API GetBashCompletionSuggestions(const String& type, const String& word);
+std::vector<String> I2_CLI_API GetFieldCompletionSuggestions(const Type *type, const String& word);
 
 /**
  * A CLI command.
  *
  * @ingroup base
  */
-class I2_BASE_API CLICommand : public Object
+class I2_CLI_API CLICommand : public Object
 {
 public:
        DECLARE_PTR_TYPEDEFS(CLICommand);
@@ -78,7 +78,7 @@ private:
  *
  * @ingroup base
  */
-class I2_BASE_API RegisterCLICommandHelper
+class I2_CLI_API RegisterCLICommandHelper
 {
 public:
        RegisterCLICommandHelper(const String& name, const CLICommand::Ptr& command);

diff --git a/lib/cli/repositoryobjectcommand.hpp b/lib/cli/repositoryobjectcommand.hpp
index cb16c676a36e72caa8da88b5b9804ddbb67d857e..0ecedf1dc8c6f660008a577a94e30cfb5db3379f 100644 (file)
--- a/lib/cli/repositoryobjectcommand.hpp
+++ b/lib/cli/repositoryobjectcommand.hpp
@@ -37,7 +37,7 @@ enum RepositoryCommandType
  *
  * @ingroup cli
  */
-class RepositoryObjectCommand : public CLICommand
+class I2_CLI_API RepositoryObjectCommand : public CLICommand
 {
 public:
        DECLARE_PTR_TYPEDEFS(RepositoryObjectCommand);
@@ -61,7 +61,7 @@ private:
  *
  * @ingroup cli
  */
-class I2_BASE_API RegisterRepositoryCLICommandHelper
+class I2_CLI_API RegisterRepositoryCLICommandHelper
 {
 public:
        RegisterRepositoryCLICommandHelper(const String& type);