##// END OF EJS Templates
Fixed OSX build
jeandet -
r1395:655463cb68b2
parent child
Show More
@@ -27,11 +27,18 else
27 27 rc = []
28 28 endif
29 29
30 app_libs = []
31
32 if 'static' == get_option('default_library')
33 app_libs = [ sciqlop_amdaplugin, sciqlop_mockplugin]
34 endif
35
30 36 sciqlop_app = executable('sciqlop',
31 37 app_sources,
32 38 app_moc_files,
33 39 rc,
34 40 include_directories : [ app_inc],
41 link_with: app_libs,
35 42 dependencies : [sciqlop_gui, sciqlop_core],
36 43 install : true
37 44 )
@@ -1,7 +1,7
1 1 #!/bin/bash
2 2
3 3 mkdir build
4 meson --prefix=/tmp/SciQLOP.app --bindir=Contents/MacOS build
4 meson -Dcpp_args='-DQT_STATICPLUGIN' -Ddefault_library=static --prefix=/tmp/SciQLOP.app --bindir=Contents/MacOS build
5 5 cd build
6 6 ninja
7 7 ninja install
@@ -37,8 +37,8 add_project_arguments('-DSCIQLOP_AMDA_SERVER="hybrid"', language : 'cpp')
37 37
38 38 subdir('core')
39 39 subdir('gui')
40 subdir('app')
41 40 subdir('plugins')
41 subdir('app')
42 42
43 43 cppcheck = find_program('cppcheck', required : false)
44 44
@@ -22,36 +22,17 amdaplugin_resources_files = [
22 22
23 23 amdaplugin_inc = include_directories(['include'])
24 24
25 moc_gen = generator(moc,
26 output : 'moc_@BASENAME@.cpp',
27 arguments : ['@INPUT@',
28 '-DSCIQLOP_PLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/amda/resources/amda.json"',
29 '-I', meson.current_source_dir()+'/include',
30 '-I', meson.current_source_dir()+'/../../core/include/',
31 '-o', '@OUTPUT@'])
32
33 rcc_gen = generator(rcc,
34 output : 'qrc_@BASENAME@.cpp',
35 arguments : ['--name=@BASENAME@"',
36 '--output',
37 '@OUTPUT@',
38 '@INPUT@'])
39
40 amdaplugin_moc_plugin_files = moc_gen.process(amdaplugin_moc_headers)
41
42 amdaplugin_rcc_plugin_files = rcc_gen.process(amdaplugin_resources_files)
43
44 #amdaplugin_rcc_plugin_files = qt5.preprocess(
45 # qresources : amdaplugin_resources_files)
46
47 amdaplugin_moc_files = qt5.preprocess(
48 ui_files : amdaplugin_ui_files)
25 amdaplugin_prep_files = qt5.preprocess(moc_headers : amdaplugin_moc_headers,
26 moc_extra_arguments: ['-DSCIQLOP_PLUGIN_JSON_FILE_PATH="'+
27 meson.source_root()+
28 '/plugins/amda/resources/amda.json"'],
29 include_directories: [amdaplugin_inc, core_inc],
30 qresources : amdaplugin_resources_files,
31 ui_files : amdaplugin_ui_files)
49 32
50 33 sciqlop_amdaplugin = library('amdaplugin',
51 34 amdaplugin_sources,
52 amdaplugin_moc_files,
53 amdaplugin_rcc_plugin_files,
54 amdaplugin_moc_plugin_files,
35 amdaplugin_prep_files,
55 36 cpp_args : ['-DAMDA_LIB','-DQT_PLUGIN'],
56 37 include_directories : [amdaplugin_inc],
57 38 dependencies : [sciqlop_core, sciqlop_gui],
General Comments 0
You need to be logged in to leave comments. Login now