##// END OF EJS Templates
Minor AppImage and Meson fixes...
jeandet -
r1443:0b787f764159
parent child
Show More
@@ -1,46 +1,46
1 1
2 2 app_moc_headers = [
3 3 'include/MainWindow.h'
4 4 ]
5 5
6 6 app_ui_files = [
7 7 'ui/MainWindow.ui'
8 8 ]
9 9
10 10 app_qresources = ['resources/qlopapp.qrc']
11 11
12 12 app_moc_files = qt5.preprocess(moc_headers : app_moc_headers,
13 13 ui_files : app_ui_files,
14 14 qresources : app_qresources)
15 15
16 16 app_sources = [
17 17 'src/Main.cpp',
18 18 'src/MainWindow.cpp'
19 19 ]
20 20
21 21 app_inc = include_directories(['include'])
22 22
23 23 if host_machine.system()=='windows' or build_machine.system()=='windows'
24 24 winmod = import('windows')
25 25 rc = winmod.compile_resources('resources/qlopapp.rc')
26 26 else
27 27 rc = []
28 28 endif
29 29
30 30 app_libs = []
31 31 cpp_args = []
32 32 if 'static' == get_option('default_library')
33 app_libs = [sciqlop_mockplugin, sciqlop_python_providers]
33 app_libs = [sciqlop_python_providers]
34 34 cpp_args += ['-DQT_STATICPLUGIN']
35 35 endif
36 36
37 37 sciqlop_app = executable('sciqlop',
38 38 app_sources,
39 39 app_moc_files,
40 40 rc,
41 41 include_directories : [ app_inc],
42 42 link_with: app_libs,
43 43 cpp_args: cpp_args,
44 44 dependencies : [sciqlop_gui, sciqlop_core],
45 45 install : true
46 46 )
@@ -1,10 +1,14
1 1 #!/bin/bash
2 2 mkdir build
3 3 cd build
4 mkdir -p $(pwd)/AppDir/usr
5 virtualenv -p python3 $(pwd)/AppDir/usr
6 source $(pwd)/AppDir/usr/bin/activate
7 pip install git+https://github.com/jeandet/spwc
4 8 meson --prefix=/usr ..
5 9 ninja
6 DESTDIR=AppDir ninja install
10 DESTDIR=$(pwd)/AppDir ninja install
7 11 mv AppDir/usr/lib64 AppDir/usr/lib
8 12 wget https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
9 13 chmod +x linuxdeployqt-continuous-x86_64.AppImage && ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract
10 LD_LIBRARY_PATH=AppDir/usr/lib/ ./squashfs-root/AppRun AppDir/usr/share/applications/*.desktop -appimage -extra-plugins=iconengines,platformthemes/libqgtk3.so
14 LD_LIBRARY_PATH=AppDir/usr/lib/:AppDir/usr/lib/SciQLop/ ./squashfs-root/AppRun AppDir/usr/share/applications/*.desktop -appimage -extra-plugins=iconengines,platformthemes/libqgtk3.so
@@ -1,1 +1,1
1 Subproject commit 0c2e5a797af54f4f9e5ee1a715b642abb74d4368
1 Subproject commit 854c0145877d96f95e0fb6ba08e32cb15cd49cf9
General Comments 0
You need to be logged in to leave comments. Login now