diff --git a/include/json/config.h b/include/json/config.h index 6359273a2..224d9ec28 100644 --- a/include/json/config.h +++ b/include/json/config.h @@ -35,6 +35,8 @@ #if defined(_MSC_VER) || defined(__MINGW32__) #define JSON_API __declspec(dllexport) #define JSONCPP_DISABLE_DLL_INTERFACE_WARNING +#elif defined(__OS2__) +#define JSON_API __declspec(dllexport) #elif defined(__GNUC__) || defined(__clang__) #define JSON_API __attribute__((visibility("default"))) #endif // if defined(_MSC_VER) diff --git a/src/lib_json/CMakeLists.txt b/src/lib_json/CMakeLists.txt index b7596e80b..8b93f1dc6 100644 --- a/src/lib_json/CMakeLists.txt +++ b/src/lib_json/CMakeLists.txt @@ -122,6 +122,11 @@ if(BUILD_SHARED_LIBS) POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS} ) + if(OS2) + set_target_properties(${SHARED_LIB} PROPERTIES + OS2_DEF_VENDOR "$ENV{VENDOR}" + OS2_DEF_PATCH "${PROJECT_VERSION_PATCH}") + endif() # Set library's runtime search path on OSX if(APPLE) set_target_properties(${SHARED_LIB} PROPERTIES INSTALL_RPATH "@loader_path/.")