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

Revert "[msys] Disable dllexport/dllimport on msys2" 

This reverts commit b955a0b715.
release/4.3a0
Duy-Nguyen Ta 2016-08-18 10:48:05 -04:00
parent b955a0b715
commit 6068d94bea
3 changed files with 43 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cmake/dllexport.h.in
View File

@ -26,22 +26,21 @@
// class __declspec(dllexport) MyClass { ... }; // class __declspec(dllexport) MyClass { ... };
// When included while compiling other code against GTSAM: // When included while compiling other code against GTSAM:
// class __declspec(dllimport) MyClass { ... }; // class __declspec(dllimport) MyClass { ... };
#ifdef _WIN32
// mnaranjo: we don't want dllexport on msys2 # ifdef @library_name@_EXPORTS
//#ifdef _WIN32 # define @library_name@_EXPORT __declspec(dllexport)
//# ifdef @library_name@_EXPORTS # define @library_name@_EXTERN_EXPORT __declspec(dllexport) extern
//# define @library_name@_EXPORT __declspec(dllexport) # else
//# define @library_name@_EXTERN_EXPORT __declspec(dllexport) extern # ifndef @library_name@_IMPORT_STATIC
//# else # define @library_name@_EXPORT __declspec(dllimport)
//# ifndef @library_name@_IMPORT_STATIC # define @library_name@_EXTERN_EXPORT __declspec(dllimport)
//# define @library_name@_EXPORT __declspec(dllimport) # else /* @library_name@_IMPORT_STATIC */
//# define @library_name@_EXTERN_EXPORT __declspec(dllimport) # define @library_name@_EXPORT
//# else /* @library_name@_IMPORT_STATIC */ # define @library_name@_EXTERN_EXPORT extern
//# define @library_name@_EXPORT # endif /* @library_name@_IMPORT_STATIC */
//# define @library_name@_EXTERN_EXPORT extern # endif /* @library_name@_EXPORTS */
//# endif /* @library_name@_IMPORT_STATIC */ #else /* _WIN32 */
//# endif /* @library_name@_EXPORTS */
//#else /* _WIN32 */
# define @library_name@_EXPORT # define @library_name@_EXPORT
# define @library_name@_EXTERN_EXPORT extern # define @library_name@_EXTERN_EXPORT extern
//#endif #endif

23
gtsam/3rdparty/GeographicLib/include/GeographicLib/Constants.hpp vendored
View File

@ -39,19 +39,18 @@
# endif # endif
#endif #endif
// mnaranjo: disable dllexport on msys2 #if defined(_MSC_VER) && defined(GEOGRAPHICLIB_SHARED_LIB) && \
//#if defined(_MSC_VER) && defined(GEOGRAPHICLIB_SHARED_LIB) && \ GEOGRAPHICLIB_SHARED_LIB
// GEOGRAPHICLIB_SHARED_LIB # if GEOGRAPHICLIB_SHARED_LIB > 1
//# if GEOGRAPHICLIB_SHARED_LIB > 1 # error GEOGRAPHICLIB_SHARED_LIB must be 0 or 1
//# error GEOGRAPHICLIB_SHARED_LIB must be 0 or 1 # elif defined(GeographicLib_EXPORTS)
//# elif defined(GeographicLib_EXPORTS) # define GEOGRAPHICLIB_EXPORT __declspec(dllexport)
//# define GEOGRAPHICLIB_EXPORT __declspec(dllexport) # else
//# else # define GEOGRAPHICLIB_EXPORT __declspec(dllimport)
//# define GEOGRAPHICLIB_EXPORT __declspec(dllimport) # endif
//# endif #else
//#else
# define GEOGRAPHICLIB_EXPORT # define GEOGRAPHICLIB_EXPORT
//#endif #endif
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>

32
gtsam_unstable/base/dllexport.h
View File

@ -16,21 +16,21 @@
* @date Mar 9, 2013 * @date Mar 9, 2013
*/ */
// mnaranjo: disable dllexport on msys2 #ifdef _WIN32
//#ifdef _WIN32 # ifdef GTSAM_UNSTABLE_EXPORTS
//# ifdef GTSAM_UNSTABLE_EXPORTS # define GTSAM_UNSTABLE_EXPORT __declspec(dllexport)
//# define GTSAM_UNSTABLE_EXPORT __declspec(dllexport) # define GTSAM_UNSTABLE_EXTERN_EXPORT __declspec(dllexport) extern
//# define GTSAM_UNSTABLE_EXTERN_EXPORT __declspec(dllexport) extern # else
//# else # ifndef GTSAM_UNSTABLE_IMPORT_STATIC
//# ifndef GTSAM_UNSTABLE_IMPORT_STATIC # define GTSAM_UNSTABLE_EXPORT __declspec(dllimport)
//# define GTSAM_UNSTABLE_EXPORT __declspec(dllimport) # define GTSAM_UNSTABLE_EXTERN_EXPORT __declspec(dllimport)
//# define GTSAM_UNSTABLE_EXTERN_EXPORT __declspec(dllimport) # else /* GTSAM_UNSTABLE_IMPORT_STATIC */
//# else /* GTSAM_UNSTABLE_IMPORT_STATIC */ # define GTSAM_UNSTABLE_EXPORT
//# define GTSAM_UNSTABLE_EXPORT # define GTSAM_UNSTABLE_EXTERN_EXPORT extern
//# define GTSAM_UNSTABLE_EXTERN_EXPORT extern # endif /* GTSAM_UNSTABLE_IMPORT_STATIC */
//# endif /* GTSAM_UNSTABLE_IMPORT_STATIC */ # endif /* GTSAM_UNSTABLE_EXPORTS */
//# endif /* GTSAM_UNSTABLE_EXPORTS */ #else /* _WIN32 */
//#else /* _WIN32 */
# define GTSAM_UNSTABLE_EXPORT # define GTSAM_UNSTABLE_EXPORT
# define GTSAM_UNSTABLE_EXTERN_EXPORT extern # define GTSAM_UNSTABLE_EXTERN_EXPORT extern
//#endif #endif