Added pch.h files for meson and used same CMakeLists.txt structure

This commit is contained in:
Filippo Cucchetto 2016-01-23 14:50:14 +01:00
parent 46eb5683e6
commit 7dd54c48e9
5 changed files with 51 additions and 35 deletions

22
lib/meson.build Normal file
View File

@ -0,0 +1,22 @@
lib_version = '1.0.0'
lib_dependencies = dependency('qt5', modules : ['Core', 'Widgets', 'Quick', 'Qml'])
lib_sources = [
'src/DosQAbstractListModel.cpp',
'src/DosQMetaObject.cpp',
'src/DosQObject.cpp',
'src/DosQObjectImpl.cpp',
'src/DOtherSide.cpp',
'src/DOtherSideTypesCpp.cpp',
'src/OnSlotExecutedHandler.cpp'
]
lib_include_directories = ['include', 'include/Qt']
lib_pch = '../pch/lib_pch.h'
lib = shared_library('DOtherSide',
sources : lib_sources,
include_directories : include_directories(lib_include_directories),
dependencies : lib_dependencies,
version: lib_version,
soversion:0,
cpp_pch: lib_pch
)

View File

@ -1,37 +1,4 @@
project('DOtherSide', 'cpp', default_options : ['cpp_std=c++14'])
lib_version = '1.0.0'
lib_dependencies = dependency('qt5', modules : ['Core', 'Widgets', 'Quick', 'Qml'])
lib_sources = [
'lib/src/DosQAbstractListModel.cpp',
'lib/src/DosQMetaObject.cpp',
'lib/src/DosQObject.cpp',
'lib/src/DosQObjectImpl.cpp',
'lib/src/DOtherSide.cpp',
'lib/src/DOtherSideTypesCpp.cpp',
'lib/src/OnSlotExecutedHandler.cpp'
]
lib_include_directories = ['lib/include', 'lib/include/Qt']
lib = shared_library('DOtherSide',
sources : lib_sources,
include_directories : include_directories(lib_include_directories),
dependencies : lib_dependencies,
version: lib_version,
soversion:0
)
test_dependencies = dependency('qt5', modules : ['Core', 'Widgets', 'Quick', 'Qml', 'Test'])
test_sources = 'test/test_dotherside.cpp'
test_resources = 'test/Resources.qrc'
test_include_directories = ['lib/include', 'lib/include/Qt']
qt5 = import('qt5')
test_moc_files = qt5.preprocess(moc_sources : test_sources, qresources : test_resources)
executable('TestDOtherSide',
sources : [test_sources, test_moc_files],
include_directories : include_directories(test_include_directories),
link_with : lib,
dependencies : test_dependencies
)
subdir('lib')
subdir('test')

5
pch/lib_pch.h Normal file
View File

@ -0,0 +1,5 @@
#include <QtCore>
#include <QtWidgets>
#include <QtGui>
#include <QtQml>
#include <QtQuick>

6
pch/test_pch.h Normal file
View File

@ -0,0 +1,6 @@
#include <QtCore>
#include <QtWidgets>
#include <QtGui>
#include <QtQml>
#include <QtQuick>
#include <QtTest>

16
test/meson.build Normal file
View File

@ -0,0 +1,16 @@
test_dependencies = dependency('qt5', modules : ['Core', 'Widgets', 'Quick', 'Qml', 'Test'])
test_sources = 'test_dotherside.cpp'
test_resources = 'Resources.qrc'
test_include_directories = ['../lib/include', '../lib/include/Qt']
test_pch = '../pch/test_pch.h'
qt5 = import('qt5')
test_moc_files = qt5.preprocess(moc_sources : test_sources, qresources : test_resources)
executable('TestDOtherSide',
sources : [test_sources, test_moc_files],
include_directories : include_directories(test_include_directories),
link_with : lib,
dependencies : test_dependencies,
cpp_pch: test_pch
)