Skip to content

Commit eabe299

Browse files
committed
Merge branch 'release/0.1.4'
2 parents 7d30b24 + e773803 commit eabe299

File tree

4 files changed

+28
-12
lines changed

4 files changed

+28
-12
lines changed

Diff for: examples/SimpleTest.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#include <iostream>
22
#include <cstdlib>
3-
#include <ByteConvert/ByteConvert.hpp>
3+
// Use: #include <ByteConvert/ByteConvert.hpp>
4+
// For testing
5+
#include "../libbyteconvert/ByteConvert.hpp"
46

57
using namespace std;
68

Diff for: examples/meson.build

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
SimpleTest = executable('SimpleTest','SimpleTest.cpp',
2+
link_with: mylib)
3+
test('SimpleTest',SimpleTest)

Diff for: libbyteconvert/meson.build

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
pkg = import('pkgconfig')
2-
mylib = shared_library('byteconvert', 'ByteConvert.cpp', version : '0.1.3', soversion : '0',install: true)
3-
install_headers('ByteConvert.hpp', subdir : 'ByteConvert')
4-
pkg.generate(libraries : mylib,
5-
version : '0.1.3',
6-
name : 'libbyteconvert',
7-
filebase : 'libbyteconvert',
8-
description : 'A conversion library.',
9-
url: 'https://github.com/SloCompTech/ByteConvert_cpp')
1+
mylib = shared_library('byteconvert', 'ByteConvert.cpp',
2+
version : meson.project_version(),
3+
soversion : '0',
4+
install: true)
5+
install_headers('ByteConvert.hpp', subdir : 'ByteConvert')

Diff for: meson.build

+17-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,17 @@
1-
project('libbyteconvert','cpp',version:'0.1.3',default_options : ['c_std=c11', 'cpp_std=c++11'])
2-
subdir('libbyteconvert')
1+
project('libbyteconvert','cpp',
2+
version:'0.1.4',
3+
default_options : [
4+
'c_std=c11',
5+
'cpp_std=c++11'])
6+
pkg = import('pkgconfig')
7+
8+
subdir('libbyteconvert')
9+
10+
pkg.generate(libraries : mylib,
11+
version : meson.project_version(),
12+
name : 'libbyteconvert',
13+
filebase : 'byteconvert',
14+
description : 'A conversion library.',
15+
url: 'https://github.com/SloCompTech/ByteConvert_cpp')
16+
17+
subdir('examples')

0 commit comments

Comments
 (0)