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

[msys] Disable dllexport/dllimport on msys2

release/4.3a0
Manuel Naranjo 2016-08-16 14:03:14 -03:00
parent c21186c621
commit b955a0b715
3 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cmake/dllexport.h.in
View File

@ -26,21 +26,22 @@
// 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
# ifdef @library_name@_EXPORTS // mnaranjo: we don't want dllexport on msys2
# define @library_name@_EXPORT __declspec(dllexport) //#ifdef _WIN32
# define @library_name@_EXTERN_EXPORT __declspec(dllexport) extern //# ifdef @library_name@_EXPORTS
# else //# define @library_name@_EXPORT __declspec(dllexport)
# ifndef @library_name@_IMPORT_STATIC //# define @library_name@_EXTERN_EXPORT __declspec(dllexport) extern
# define @library_name@_EXPORT __declspec(dllimport) //# else
# define @library_name@_EXTERN_EXPORT __declspec(dllimport) //# ifndef @library_name@_IMPORT_STATIC
# else /* @library_name@_IMPORT_STATIC */ //# define @library_name@_EXPORT __declspec(dllimport)
# define @library_name@_EXPORT //# define @library_name@_EXTERN_EXPORT __declspec(dllimport)
# define @library_name@_EXTERN_EXPORT extern //# else /* @library_name@_IMPORT_STATIC */
# endif /* @library_name@_IMPORT_STATIC */ //# define @library_name@_EXPORT
# endif /* @library_name@_EXPORTS */ //# define @library_name@_EXTERN_EXPORT extern
#else /* _WIN32 */ //# endif /* @library_name@_IMPORT_STATIC */
//# 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,18 +39,19 @@
# endif # endif
#endif #endif
#if defined(_MSC_VER) && defined(GEOGRAPHICLIB_SHARED_LIB) && \ // mnaranjo: disable dllexport on msys2
GEOGRAPHICLIB_SHARED_LIB //#if defined(_MSC_VER) && defined(GEOGRAPHICLIB_SHARED_LIB) && \
# if GEOGRAPHICLIB_SHARED_LIB > 1 // GEOGRAPHICLIB_SHARED_LIB
# error GEOGRAPHICLIB_SHARED_LIB must be 0 or 1 //# if GEOGRAPHICLIB_SHARED_LIB > 1
# elif defined(GeographicLib_EXPORTS) //# error GEOGRAPHICLIB_SHARED_LIB must be 0 or 1
# define GEOGRAPHICLIB_EXPORT __declspec(dllexport) //# elif defined(GeographicLib_EXPORTS)
# else //# define GEOGRAPHICLIB_EXPORT __declspec(dllexport)
# define GEOGRAPHICLIB_EXPORT __declspec(dllimport) //# else
# endif //# define GEOGRAPHICLIB_EXPORT __declspec(dllimport)
#else //# endif
//#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
*/ */
#ifdef _WIN32 // mnaranjo: disable dllexport on msys2
# ifdef GTSAM_UNSTABLE_EXPORTS //#ifdef _WIN32
# define GTSAM_UNSTABLE_EXPORT __declspec(dllexport) //# ifdef GTSAM_UNSTABLE_EXPORTS
# define GTSAM_UNSTABLE_EXTERN_EXPORT __declspec(dllexport) extern //# define GTSAM_UNSTABLE_EXPORT __declspec(dllexport)
# else //# define GTSAM_UNSTABLE_EXTERN_EXPORT __declspec(dllexport) extern
# ifndef GTSAM_UNSTABLE_IMPORT_STATIC //# else
# define GTSAM_UNSTABLE_EXPORT __declspec(dllimport) //# ifndef GTSAM_UNSTABLE_IMPORT_STATIC
# define GTSAM_UNSTABLE_EXTERN_EXPORT __declspec(dllimport) //# define GTSAM_UNSTABLE_EXPORT __declspec(dllimport)
# else /* GTSAM_UNSTABLE_IMPORT_STATIC */ //# define GTSAM_UNSTABLE_EXTERN_EXPORT __declspec(dllimport)
# define GTSAM_UNSTABLE_EXPORT //# else /* GTSAM_UNSTABLE_IMPORT_STATIC */
# define GTSAM_UNSTABLE_EXTERN_EXPORT extern //# define GTSAM_UNSTABLE_EXPORT
# endif /* GTSAM_UNSTABLE_IMPORT_STATIC */ //# define GTSAM_UNSTABLE_EXTERN_EXPORT extern
# endif /* GTSAM_UNSTABLE_EXPORTS */ //# endif /* GTSAM_UNSTABLE_IMPORT_STATIC */
#else /* _WIN32 */ //# endif /* GTSAM_UNSTABLE_EXPORTS */
//#else /* _WIN32 */
# define GTSAM_UNSTABLE_EXPORT # define GTSAM_UNSTABLE_EXPORT
# define GTSAM_UNSTABLE_EXTERN_EXPORT extern # define GTSAM_UNSTABLE_EXTERN_EXPORT extern
#endif //#endif