generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-01-06 00:31:10 +01:00
Code Issues Projects Releases Wiki Activity

Fix for #798

Browse Source 
Add preprocessor definitions for MSVC dllexport/dllimport statements

(cherry picked from commit 2654b6bbbf)
This commit is contained in:
Peter Spiess-Knafl 2018-06-18 11:28:56 +02:00 committed by Christopher Dunn
parent ee34ac1fbb
commit b87f6dbc8a
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
meson.build
View File

@ -46,6 +46,14 @@ install_headers(
jsoncpp_headers, jsoncpp_headers,
subdir : 'json') subdir : 'json')
if get_option('default_library') == 'shared' and meson.get_compiler('cpp').get_id() == 'msvc'
dll_export_flag = '-DJSON_DLL_BUILD'
dll_import_flag = '-DJSON_DLL'
else
dll_export_flag = ''
dll_import_flag = ''
endif
jsoncpp_lib = library( jsoncpp_lib = library(
'jsoncpp', 'jsoncpp',
[ jsoncpp_gen_sources, [ jsoncpp_gen_sources,
@ -56,7 +64,8 @@ jsoncpp_lib = library(
'src/lib_json/json_writer.cpp'], 'src/lib_json/json_writer.cpp'],
soversion : 20, soversion : 20,
install : true, install : true,
include_directories : jsoncpp_include_directories) include_directories : jsoncpp_include_directories,
cpp_args: dll_export_flag)
import('pkgconfig').generate( import('pkgconfig').generate(
libraries : jsoncpp_lib, libraries : jsoncpp_lib,
@ -82,7 +91,8 @@ jsoncpp_test = executable(
'src/test_lib_json/main.cpp'], 'src/test_lib_json/main.cpp'],
include_directories : jsoncpp_include_directories, include_directories : jsoncpp_include_directories,
link_with : jsoncpp_lib, link_with : jsoncpp_lib,
install : false) install : false,
cpp_args: dll_import_flag)
test( test(
'unittest_jsoncpp_test', 'unittest_jsoncpp_test',
jsoncpp_test) jsoncpp_test)
@ -92,7 +102,8 @@ jsontestrunner = executable(
'src/jsontestrunner/main.cpp', 'src/jsontestrunner/main.cpp',
include_directories : jsoncpp_include_directories, include_directories : jsoncpp_include_directories,
link_with : jsoncpp_lib, link_with : jsoncpp_lib,
install : false) install : false,
cpp_args: dll_import_flag)
test( test(
'unittest_jsontestrunner', 'unittest_jsontestrunner',
python, python,