tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build fix for Windows

This commit is contained in:
Gunnar Beutner 2014-10-20 20:04:26 +02:00
parent 11426125e8
commit 4d7caeabab
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/cli/CMakeLists.txt
View File

@ -37,6 +37,7 @@ target_link_libraries(cli ${Boost_LIBRARIES} base config remote icinga)
set_target_properties ( set_target_properties (
cli PROPERTIES cli PROPERTIES
INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/icinga2 INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/icinga2
DEFINE_SYMBOL I2_CLI_BUILD
FOLDER Lib FOLDER Lib
) )

4
lib/cli/agentblackandwhitelistcommand.hpp
View File

@ -37,7 +37,7 @@ enum BlackAndWhitelistCommandType
* *
* @ingroup cli * @ingroup cli
*/ */
class BlackAndWhitelistCommand : public CLICommand class I2_CLI_API BlackAndWhitelistCommand : public CLICommand
{ {
public: public:
DECLARE_PTR_TYPEDEFS(BlackAndWhitelistCommand); DECLARE_PTR_TYPEDEFS(BlackAndWhitelistCommand);
@ -60,7 +60,7 @@ private:
* *
* @ingroup cli * @ingroup cli
*/ */
class I2_BASE_API RegisterBlackAndWhitelistCLICommandHelper class I2_CLI_API RegisterBlackAndWhitelistCLICommandHelper
{ {
public: public:
RegisterBlackAndWhitelistCLICommandHelper(const String& type); RegisterBlackAndWhitelistCLICommandHelper(const String& type);

10
lib/cli/clicommand.hpp
View File

@ -20,7 +20,7 @@
#ifndef CLICOMMAND_H #ifndef CLICOMMAND_H
#define CLICOMMAND_H #define CLICOMMAND_H
#include "base/i2-base.hpp" #include "cli/i2-cli.hpp"
#include "base/value.hpp" #include "base/value.hpp"
#include "base/utility.hpp" #include "base/utility.hpp"
#include <vector> #include <vector>
@ -29,15 +29,15 @@
namespace icinga namespace icinga
{ {
I2_BASE_API std::vector<String> GetBashCompletionSuggestions(const String& type, const String& word); std::vector<String> I2_CLI_API 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 GetFieldCompletionSuggestions(const Type *type, const String& word);
/** /**
* A CLI command. * A CLI command.
* *
* @ingroup base * @ingroup base
*/ */
class I2_BASE_API CLICommand : public Object class I2_CLI_API CLICommand : public Object
{ {
public: public:
DECLARE_PTR_TYPEDEFS(CLICommand); DECLARE_PTR_TYPEDEFS(CLICommand);
@ -78,7 +78,7 @@ private:
* *
* @ingroup base * @ingroup base
*/ */
class I2_BASE_API RegisterCLICommandHelper class I2_CLI_API RegisterCLICommandHelper
{ {
public: public:
RegisterCLICommandHelper(const String& name, const CLICommand::Ptr& command); RegisterCLICommandHelper(const String& name, const CLICommand::Ptr& command);

4
lib/cli/repositoryobjectcommand.hpp
View File

@ -37,7 +37,7 @@ enum RepositoryCommandType
* *
* @ingroup cli * @ingroup cli
*/ */
class RepositoryObjectCommand : public CLICommand class I2_CLI_API RepositoryObjectCommand : public CLICommand
{ {
public: public:
DECLARE_PTR_TYPEDEFS(RepositoryObjectCommand); DECLARE_PTR_TYPEDEFS(RepositoryObjectCommand);
@ -61,7 +61,7 @@ private:
* *
* @ingroup cli * @ingroup cli
*/ */
class I2_BASE_API RegisterRepositoryCLICommandHelper class I2_CLI_API RegisterRepositoryCLICommandHelper
{ {
public: public:
RegisterRepositoryCLICommandHelper(const String& type); RegisterRepositoryCLICommandHelper(const String& type);