mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-06-26 18:00:49 +00:00
meson: make check and tests build on Windows with msvc
This commit is contained in:
parent
9d335a80d0
commit
fbbe6c646e
|
@ -54,19 +54,26 @@ CK_CPPSTART
|
||||||
#define CK_ATTRIBUTE_NORETURN
|
#define CK_ATTRIBUTE_NORETURN
|
||||||
#endif /* GCC 2.5 */
|
#endif /* GCC 2.5 */
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Used to create the linker script for hiding lib-local symbols. Shall
|
* Used to create the linker script for hiding lib-local symbols. Shall
|
||||||
* be put directly in front of the exported symbol.
|
* be put directly in front of the exported symbol.
|
||||||
*/
|
*/
|
||||||
#define CK_EXPORT
|
#define CK_EXPORT
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Used for MSVC to create the export attribute
|
* Used for MSVC to create the export attribute
|
||||||
* CK_DLL_EXP is defined during the compilation of the library
|
* CK_DLL_EXP is defined during the compilation of the library
|
||||||
* on the command line.
|
* on the command line.
|
||||||
*/
|
*/
|
||||||
#ifndef CK_DLL_EXP
|
#ifndef CK_DLL_EXP
|
||||||
#define CK_DLL_EXP extern
|
# if defined(_MSC_VER)
|
||||||
|
# define CK_DLL_EXP __declspec(dllimport)
|
||||||
|
# else
|
||||||
|
# define CK_DLL_EXP extern
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* check version numbers */
|
/* check version numbers */
|
||||||
#define CHECK_MAJOR_VERSION (@CHECK_MAJOR_VERSION@)
|
#define CHECK_MAJOR_VERSION (@CHECK_MAJOR_VERSION@)
|
||||||
#define CHECK_MINOR_VERSION (@CHECK_MINOR_VERSION@)
|
#define CHECK_MINOR_VERSION (@CHECK_MINOR_VERSION@)
|
||||||
|
@ -79,6 +86,10 @@ CK_DLL_EXP /*extern*/ int CK_EXPORT check_micro_version;
|
||||||
#define NULL ((void*)0)
|
#define NULL ((void*)0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(_MSC_VER)
|
||||||
|
#define pid_t int
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Type for a test case
|
* Type for a test case
|
||||||
*
|
*
|
||||||
|
@ -1296,7 +1307,9 @@ CK_DLL_EXP void CK_EXPORT srunner_set_fork_status (SRunner * sr,
|
||||||
*
|
*
|
||||||
* @since 0.9.3
|
* @since 0.9.3
|
||||||
*/
|
*/
|
||||||
|
#if !defined(_MSC_VER)
|
||||||
CK_DLL_EXP pid_t CK_EXPORT check_fork (void);
|
CK_DLL_EXP pid_t CK_EXPORT check_fork (void);
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Wait for the pid and exit.
|
* Wait for the pid and exit.
|
||||||
|
@ -1313,9 +1326,11 @@ CK_DLL_EXP pid_t CK_EXPORT check_fork (void);
|
||||||
*
|
*
|
||||||
* @since 0.9.3
|
* @since 0.9.3
|
||||||
*/
|
*/
|
||||||
|
#if !defined(_MSC_VER)
|
||||||
CK_DLL_EXP void CK_EXPORT
|
CK_DLL_EXP void CK_EXPORT
|
||||||
check_waitpid_and_exit (pid_t pid)
|
check_waitpid_and_exit (pid_t pid)
|
||||||
CK_ATTRIBUTE_NORETURN;
|
CK_ATTRIBUTE_NORETURN;
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
CK_CPPEND
|
CK_CPPEND
|
||||||
|
|
|
@ -58,6 +58,8 @@
|
||||||
#include <WinSock2.h> /* struct timeval, API used in gettimeofday implementation */
|
#include <WinSock2.h> /* struct timeval, API used in gettimeofday implementation */
|
||||||
#include <io.h> /* read, write */
|
#include <io.h> /* read, write */
|
||||||
#include <process.h> /* getpid */
|
#include <process.h> /* getpid */
|
||||||
|
#include <BaseTsd.h> /* for ssize_t */
|
||||||
|
typedef SSIZE_T ssize_t;
|
||||||
#endif /* _MSC_VER */
|
#endif /* _MSC_VER */
|
||||||
|
|
||||||
/* defines size_t */
|
/* defines size_t */
|
||||||
|
|
|
@ -58,7 +58,11 @@ internal_check_h_inc = include_directories('..')
|
||||||
if have_visibility_hidden
|
if have_visibility_hidden
|
||||||
libcheck_visibility_args = ['-DCK_DLL_EXP=extern __attribute__ ((visibility ("default")))']
|
libcheck_visibility_args = ['-DCK_DLL_EXP=extern __attribute__ ((visibility ("default")))']
|
||||||
else
|
else
|
||||||
libcheck_visibility_args = ['-DCK_DLL_EXP=extern']
|
if host_system == 'windows'
|
||||||
|
libcheck_visibility_args = ['-DCK_DLL_EXP=__declspec(dllexport)']
|
||||||
|
else
|
||||||
|
libcheck_visibility_args = ['-DCK_DLL_EXP=extern']
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libcheck = static_library('check',
|
libcheck = static_library('check',
|
||||||
|
|
|
@ -38,7 +38,7 @@ configure_file(input : 'libcheck/check.h.in',
|
||||||
|
|
||||||
gst_check = shared_library('gstcheck-@0@'.format(apiversion),
|
gst_check = shared_library('gstcheck-@0@'.format(apiversion),
|
||||||
gst_check_sources,
|
gst_check_sources,
|
||||||
c_args : gst_c_args,
|
c_args : gst_c_args + ['-DGST_EXPORTS'],
|
||||||
version : libversion,
|
version : libversion,
|
||||||
soversion : soversion,
|
soversion : soversion,
|
||||||
install : true,
|
install : true,
|
||||||
|
|
|
@ -2,7 +2,4 @@ subdir('base')
|
||||||
subdir('controller')
|
subdir('controller')
|
||||||
subdir('net')
|
subdir('net')
|
||||||
subdir('helpers')
|
subdir('helpers')
|
||||||
# FIXME: make check work on windows
|
|
||||||
if host_machine.system() != 'windows'
|
|
||||||
subdir('check')
|
subdir('check')
|
||||||
endif
|
|
||||||
|
|
|
@ -24,14 +24,12 @@ pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir'))
|
||||||
|
|
||||||
pkg_files = ['gstreamer-base',
|
pkg_files = ['gstreamer-base',
|
||||||
'gstreamer-controller',
|
'gstreamer-controller',
|
||||||
|
'gstreamer-check',
|
||||||
'gstreamer-net',
|
'gstreamer-net',
|
||||||
'gstreamer'
|
'gstreamer'
|
||||||
]
|
]
|
||||||
|
|
||||||
if host_machine.system() != 'windows'
|
pkgconf.set('checklibdir', join_paths(meson.build_root(), gst_check.outdir()))
|
||||||
pkgconf.set('checklibdir', join_paths(meson.build_root(), gst_check.outdir()))
|
|
||||||
pkg_files += ['gstreamer-check']
|
|
||||||
endif
|
|
||||||
|
|
||||||
foreach p : pkg_files
|
foreach p : pkg_files
|
||||||
infile = p + '.pc.in'
|
infile = p + '.pc.in'
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
subdir('benchmarks')
|
subdir('benchmarks')
|
||||||
# FIXME: make check work on windows
|
|
||||||
if host_machine.system() != 'windows'
|
|
||||||
subdir('check')
|
subdir('check')
|
||||||
endif
|
|
||||||
if not get_option('disable_examples')
|
if not get_option('disable_examples')
|
||||||
subdir('examples')
|
subdir('examples')
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue