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

View File

@ -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
)

View File

@ -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);

View File

@ -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);

View File

@ -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);