Commit 4ae3dbc1 authored by Ghislain MARY's avatar Ghislain MARY

Fix definition of BELCARD_PUBLIC.

parent 0485f409
......@@ -98,9 +98,15 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/config.h PROPERTIES GENERATED ON)
add_definitions("-DHAVE_CONFIG_H")
if(BCTOOLBOX_CPPFLAGS)
add_definitions(${BCTOOLBOX_CPPFLAGS})
set(BELCARD_CPPFLAGS ${BCTOOLBOX_CPPFLAGS} ${BELR_CPPFLAGS})
if(ENABLE_STATIC)
list(APPEND BELCARD_CPPFLAGS "-DBELCARD_STATIC")
endif()
list(REMOVE_DUPLICATES BELCARD_CPPFLAGS)
if(BELCARD_CPPFLAGS)
add_definitions(${BELCARD_CPPFLAGS})
endif()
add_definitions("-DBELCARD_EXPORTS")
set(STRICT_OPTIONS_CPP )
set(STRICT_OPTIONS_C )
......
......@@ -26,6 +26,7 @@
# BELCARD_FOUND - system has belcard
# BELCARD_INCLUDE_DIRS - the belcard include directory
# BELCARD_LIBRARIES - The libraries needed to use belcard
# BELCARD_CPPFLAGS - The compilation flags needed to use belcard
if(NOT LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
include("${CMAKE_CURRENT_LIST_DIR}/BelcardTargets.cmake")
......@@ -54,4 +55,5 @@ if(BELR_FOUND)
list(APPEND BELCARD_LIBRARIES ${BELR_LIBRARIES})
endif()
set(BELCARD_CPPFLAGS @BELCARD_CPPFLAGS@)
set(BELCARD_FOUND 1)
......@@ -19,6 +19,7 @@
#ifndef belcard_hpp
#define belcard_hpp
#include "belcard_utils.hpp"
#include "belcard_generic.hpp"
#include "belcard_params.hpp"
#include "belcard_property.hpp"
......@@ -38,14 +39,6 @@
#include <string>
#include <list>
#ifndef BELCARD_PUBLIC
#if defined(_MSC_VER)
#define BELCARD_PUBLIC __declspec(dllexport)
#else
#define BELCARD_PUBLIC
#endif
#endif
using namespace::std;
using namespace::belr;
......
......@@ -19,6 +19,7 @@
#ifndef belcard_addressing_hpp
#define belcard_addressing_hpp
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
......@@ -26,14 +27,6 @@
#include <string>
#include <sstream>
#ifndef BELCARD_PUBLIC
#if defined(_MSC_VER)
#define BELCARD_PUBLIC __declspec(dllexport)
#else
#define BELCARD_PUBLIC
#endif
#endif
using namespace::std;
using namespace::belr;
......
......@@ -19,20 +19,13 @@
#ifndef belcard_calendar_hpp
#define belcard_calendar_hpp
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <string>
#ifndef BELCARD_PUBLIC
#if defined(_MSC_VER)
#define BELCARD_PUBLIC __declspec(dllexport)
#else
#define BELCARD_PUBLIC
#endif
#endif
using namespace::std;
using namespace::belr;
......
......@@ -19,6 +19,7 @@
#ifndef belcard_communication_hpp
#define belcard_communication_hpp
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
......@@ -26,14 +27,6 @@
#include <string>
#include <sstream>
#ifndef BELCARD_PUBLIC
#if defined(_MSC_VER)
#define BELCARD_PUBLIC __declspec(dllexport)
#else
#define BELCARD_PUBLIC
#endif
#endif
using namespace::std;
using namespace::belr;
......
......@@ -19,20 +19,13 @@
#ifndef belcard_explanatory_hpp
#define belcard_explanatory_hpp
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <string>
#ifndef BELCARD_PUBLIC
#if defined(_MSC_VER)
#define BELCARD_PUBLIC __declspec(dllexport)
#else
#define BELCARD_PUBLIC
#endif
#endif
using namespace::std;
using namespace::belr;
......
......@@ -19,20 +19,13 @@
#ifndef belcard_general_hpp
#define belcard_general_hpp
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <string>
#ifndef BELCARD_PUBLIC
#if defined(_MSC_VER)
#define BELCARD_PUBLIC __declspec(dllexport)
#else
#define BELCARD_PUBLIC
#endif
#endif
using namespace::std;
using namespace::belr;
......
......@@ -19,19 +19,12 @@
#ifndef belcard_generic_hpp
#define belcard_generic_hpp
#include "belcard_utils.hpp"
#include "belcard/vcard_grammar.hpp"
#include <memory>
#include <sstream>
#ifndef BELCARD_PUBLIC
#if defined(_MSC_VER)
#define BELCARD_PUBLIC __declspec(dllexport)
#else
#define BELCARD_PUBLIC
#endif
#endif
using namespace::std;
namespace belcard {
......
......@@ -19,20 +19,13 @@
#ifndef belcard_geographical_hpp
#define belcard_geographical_hpp
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <string>
#ifndef BELCARD_PUBLIC
#if defined(_MSC_VER)
#define BELCARD_PUBLIC __declspec(dllexport)
#else
#define BELCARD_PUBLIC
#endif
#endif
using namespace::std;
using namespace::belr;
......
......@@ -19,6 +19,7 @@
#ifndef belcard_identification_hpp
#define belcard_identification_hpp
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
......@@ -27,14 +28,6 @@
#include <list>
#include <sstream>
#ifndef BELCARD_PUBLIC
#if defined(_MSC_VER)
#define BELCARD_PUBLIC __declspec(dllexport)
#else
#define BELCARD_PUBLIC
#endif
#endif
using namespace::std;
using namespace::belr;
......
......@@ -19,20 +19,13 @@
#ifndef belcard_organizational_hpp
#define belcard_organizational_hpp
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <string>
#ifndef BELCARD_PUBLIC
#if defined(_MSC_VER)
#define BELCARD_PUBLIC __declspec(dllexport)
#else
#define BELCARD_PUBLIC
#endif
#endif
using namespace::std;
using namespace::belr;
......
......@@ -21,19 +21,12 @@
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include "belcard_utils.hpp"
#include "belcard_generic.hpp"
#include <string>
#include <sstream>
#ifndef BELCARD_PUBLIC
#if defined(_MSC_VER)
#define BELCARD_PUBLIC __declspec(dllexport)
#else
#define BELCARD_PUBLIC
#endif
#endif
using namespace::std;
using namespace::belr;
......
......@@ -21,14 +21,7 @@
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#ifndef BELCARD_PUBLIC
#if defined(_MSC_VER)
#define BELCARD_PUBLIC __declspec(dllexport)
#else
#define BELCARD_PUBLIC
#endif
#endif
#include "belcard_utils.hpp"
using namespace::belr;
......
......@@ -22,6 +22,7 @@
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include "belcard_utils.hpp"
#include "belcard/belcard_generic.hpp"
#include "belcard_params.hpp"
#include "belcard/belcard_parser.hpp"
......@@ -30,14 +31,6 @@
#include <list>
#include <sstream>
#ifndef BELCARD_PUBLIC
#if defined(_MSC_VER)
#define BELCARD_PUBLIC __declspec(dllexport)
#else
#define BELCARD_PUBLIC
#endif
#endif
using namespace::std;
using namespace::belr;
......
......@@ -19,6 +19,7 @@
#ifndef belcard_rfc6474_hpp
#define belcard_rfc6474_hpp
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
......@@ -26,14 +27,6 @@
#include <string>
#include <sstream>
#ifndef BELCARD_PUBLIC
#if defined(_MSC_VER)
#define BELCARD_PUBLIC __declspec(dllexport)
#else
#define BELCARD_PUBLIC
#endif
#endif
using namespace::std;
using namespace::belr;
......
......@@ -19,20 +19,13 @@
#ifndef belcard_security_hpp
#define belcard_security_hpp
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <string>
#ifndef BELCARD_PUBLIC
#if defined(_MSC_VER)
#define BELCARD_PUBLIC __declspec(dllexport)
#else
#define BELCARD_PUBLIC
#endif
#endif
using namespace::std;
using namespace::belr;
......
......@@ -19,20 +19,20 @@
#ifndef belcard_utils_hpp
#define belcard_utils_hpp
#if defined(_MSC_VER)
#define BELCARD_PUBLIC __declspec(dllexport)
#else
#define BELCARD_PUBLIC
#endif
#include <string>
#ifndef BELCARD_PUBLIC
#if defined(_MSC_VER)
#define BELCARD_PUBLIC __declspec(dllexport)
#ifdef _MSC_VER
#ifdef BELCARD_STATIC
#define BELCARD_PUBLIC
#else
#ifdef BELCARD_EXPORTS
#define BELCARD_PUBLIC __declspec(dllexport)
#else
#define BELCARD_PUBLIC __declspec(dllimport)
#endif
#endif
#else
#define BELCARD_PUBLIC
#endif
#define BELCARD_PUBLIC
#endif
using namespace::std;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment