12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consistent dllexport.h across gtsam & gtsam_unstable

release/4.3a0
Jose Luis Blanco-Claraco 2019-07-18 08:22:41 +02:00
parent 9f9cff407e
commit 52b0579a9b
16 changed files with 20 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtsam_unstable/CMakeLists.txt
View File

@ -44,6 +44,12 @@ foreach(subdir ${gtsam_unstable_subdirs})
add_subdirectory(${subdir})
endforeach(subdir)
# dllexport.h
set(library_name GTSAM_UNSTABLE) # For substitution in dllexport.h.in
configure_file("${GTSAM_SOURCE_DIR}/cmake/dllexport.h.in" "dllexport.h")
list(APPEND gtsam_unstable_srcs "${PROJECT_BINARY_DIR}/dllexport.h")
install(FILES "${PROJECT_BINARY_DIR}/dllexport.h" DESTINATION include/gtsam_unstable)
# assemble gtsam_unstable components
set(gtsam_unstable_srcs
${base_srcs}

2
gtsam_unstable/base/Dummy.h
View File

@ -18,7 +18,7 @@
*/
#include <gtsam/global_includes.h>
#include <gtsam_unstable/base/dllexport.h>
#include <gtsam_unstable/dllexport.h>
#include <string>
namespace gtsam {

36
gtsam_unstable/base/dllexport.h
View File

@ -1,36 +0,0 @@
/* ----------------------------------------------------------------------------
* GTSAM Copyright 2010, Georgia Tech Research Corporation,
* Atlanta, Georgia 30332-0415
* All Rights Reserved
* Authors: Frank Dellaert, et al. (see THANKS for the full author list)
* See LICENSE for the license information
* -------------------------------------------------------------------------- */
/**
* @file dllexport.h
* @brief Symbols for exporting classes and methods from DLLs
* @author Richard Roberts
* @date Mar 9, 2013
*/
#ifdef _WIN32
# ifdef GTSAM_UNSTABLE_EXPORTS
# define GTSAM_UNSTABLE_EXPORT __declspec(dllexport)
# define GTSAM_UNSTABLE_EXTERN_EXPORT __declspec(dllexport) extern
# else
# ifndef GTSAM_UNSTABLE_IMPORT_STATIC
# define GTSAM_UNSTABLE_EXPORT __declspec(dllimport)
# define GTSAM_UNSTABLE_EXTERN_EXPORT __declspec(dllimport)
# else /* GTSAM_UNSTABLE_IMPORT_STATIC */
# define GTSAM_UNSTABLE_EXPORT
# define GTSAM_UNSTABLE_EXTERN_EXPORT extern
# endif /* GTSAM_UNSTABLE_IMPORT_STATIC */
# endif /* GTSAM_UNSTABLE_EXPORTS */
#else /* _WIN32 */
# define GTSAM_UNSTABLE_EXPORT
# define GTSAM_UNSTABLE_EXTERN_EXPORT extern
#endif

2
gtsam_unstable/discrete/Constraint.h
View File

@ -17,7 +17,7 @@
#pragma once
#include <gtsam_unstable/base/dllexport.h>
#include <gtsam_unstable/dllexport.h>
#include <gtsam/discrete/DiscreteFactor.h>
#include <boost/assign.hpp>

2
gtsam_unstable/dynamics/PoseRTV.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <gtsam_unstable/base/dllexport.h>
#include <gtsam_unstable/dllexport.h>
#include <gtsam/geometry/Pose3.h>
#include <gtsam/base/ProductLieGroup.h>

2
gtsam_unstable/geometry/BearingS2.h
View File

@ -9,7 +9,7 @@
#pragma once
#include <gtsam_unstable/base/dllexport.h>
#include <gtsam_unstable/dllexport.h>
#include <gtsam/geometry/Rot2.h>
#include <gtsam/geometry/Pose3.h>

2
gtsam_unstable/geometry/Pose3Upright.h
View File

@ -11,7 +11,7 @@
#pragma once
#include <gtsam_unstable/base/dllexport.h>
#include <gtsam_unstable/dllexport.h>
#include <gtsam/geometry/Pose3.h>
#include <gtsam/geometry/Pose2.h>

2
gtsam_unstable/geometry/SimWall2D.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <gtsam_unstable/base/dllexport.h>
#include <gtsam_unstable/dllexport.h>
#include <gtsam/geometry/Pose2.h>
#include <gtsam/linear/Sampler.h>

2
gtsam_unstable/nonlinear/ConcurrentFilteringAndSmoothing.h
View File

@ -20,7 +20,7 @@
// \callgraph
#pragma once
#include <gtsam_unstable/base/dllexport.h>
#include <gtsam_unstable/dllexport.h>
#include <gtsam/nonlinear/NonlinearFactorGraph.h>
#include <gtsam/nonlinear/Values.h>
#include <gtsam/linear/GaussianFactorGraph.h>

2
gtsam_unstable/nonlinear/FixedLagSmoother.h
View File

@ -20,7 +20,7 @@
// \callgraph
#pragma once
#include <gtsam_unstable/base/dllexport.h>
#include <gtsam_unstable/dllexport.h>
#include <gtsam/inference/Key.h>
#include <gtsam/nonlinear/NonlinearFactorGraph.h>
#include <gtsam/nonlinear/Values.h>

2
gtsam_unstable/nonlinear/LinearizedFactor.h
View File

@ -18,7 +18,7 @@
#pragma once
#include <vector>
#include <gtsam_unstable/base/dllexport.h>
#include <gtsam_unstable/dllexport.h>
#include <gtsam/nonlinear/NonlinearFactor.h>
#include <gtsam/linear/JacobianFactor.h>
#include <gtsam/linear/HessianFactor.h>

2
gtsam_unstable/slam/AHRS.h
View File

@ -9,7 +9,7 @@
#define AHRS_H_
#include "Mechanization_bRn2.h"
#include <gtsam_unstable/base/dllexport.h>
#include <gtsam_unstable/dllexport.h>
#include <gtsam/linear/KalmanFilter.h>
namespace gtsam {

2
gtsam_unstable/slam/DummyFactor.h
View File

@ -9,7 +9,7 @@
#pragma once
#include <gtsam_unstable/base/dllexport.h>
#include <gtsam_unstable/dllexport.h>
#include <gtsam/nonlinear/NonlinearFactor.h>
namespace gtsam {

2
gtsam_unstable/slam/Mechanization_bRn2.h
View File

@ -9,7 +9,7 @@
#include <gtsam/geometry/Rot3.h>
#include <gtsam/base/Vector.h>
#include <gtsam_unstable/base/dllexport.h>
#include <gtsam_unstable/dllexport.h>
#include <list>
namespace gtsam {

2
gtsam_unstable/slam/RelativeElevationFactor.h
View File

@ -9,7 +9,7 @@
#pragma once
#include <gtsam_unstable/base/dllexport.h>
#include <gtsam_unstable/dllexport.h>
#include <gtsam/geometry/Pose3.h>
#include <gtsam/nonlinear/NonlinearFactor.h>

2
gtsam_unstable/slam/SmartRangeFactor.h
View File

@ -9,7 +9,7 @@
#pragma once
#include <gtsam_unstable/base/dllexport.h>
#include <gtsam_unstable/dllexport.h>
#include <gtsam/nonlinear/NonlinearFactor.h>
#include <gtsam/inference/Key.h>
#include <gtsam/geometry/Pose2.h>