##// END OF EJS Templates
HG_REPOSITORIES » LPP » SciQLOP_Repos » SciQLop
RSS
Minor AppImage and Meson fixes...
jeandet -
r1443:0b787f764159
parent child
Show More
Side by Side Unified
Context file:
r1443:0b787f764159 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,46 +1,46
1
1
2 app_moc_headers = [
2 app_moc_headers = [
3 'include/MainWindow.h'
3 'include/MainWindow.h'
4 ]
4 ]
5
5
6 app_ui_files = [
6 app_ui_files = [
7 'ui/MainWindow.ui'
7 'ui/MainWindow.ui'
8 ]
8 ]
9
9
10 app_qresources = ['resources/qlopapp.qrc']
10 app_qresources = ['resources/qlopapp.qrc']
11
11
12 app_moc_files = qt5.preprocess(moc_headers : app_moc_headers,
12 app_moc_files = qt5.preprocess(moc_headers : app_moc_headers,
13 ui_files : app_ui_files,
13 ui_files : app_ui_files,
14 qresources : app_qresources)
14 qresources : app_qresources)
15
15
16 app_sources = [
16 app_sources = [
17 'src/Main.cpp',
17 'src/Main.cpp',
18 'src/MainWindow.cpp'
18 'src/MainWindow.cpp'
19 ]
19 ]
20
20
21 app_inc = include_directories(['include'])
21 app_inc = include_directories(['include'])
22
22
23 if host_machine.system()=='windows' or build_machine.system()=='windows'
23 if host_machine.system()=='windows' or build_machine.system()=='windows'
24 winmod = import('windows')
24 winmod = import('windows')
25 rc = winmod.compile_resources('resources/qlopapp.rc')
25 rc = winmod.compile_resources('resources/qlopapp.rc')
26 else
26 else
27 rc = []
27 rc = []
28 endif
28 endif
29
29
30 app_libs = []
30 app_libs = []
31 cpp_args = []
31 cpp_args = []
32 if 'static' == get_option('default_library')
32 if 'static' == get_option('default_library')
33 app_libs = [sciqlop_mockplugin, sciqlop_python_providers]
33 app_libs = [sciqlop_python_providers]
34 cpp_args += ['-DQT_STATICPLUGIN']
34 cpp_args += ['-DQT_STATICPLUGIN']
35 endif
35 endif
36
36
37 sciqlop_app = executable('sciqlop',
37 sciqlop_app = executable('sciqlop',
38 app_sources,
38 app_sources,
39 app_moc_files,
39 app_moc_files,
40 rc,
40 rc,
41 include_directories : [ app_inc],
41 include_directories : [ app_inc],
42 link_with: app_libs,
42 link_with: app_libs,
43 cpp_args: cpp_args,
43 cpp_args: cpp_args,
44 dependencies : [sciqlop_gui, sciqlop_core],
44 dependencies : [sciqlop_gui, sciqlop_core],
45 install : true
45 install : true
46 )
46 )
Show file before | Show file after | Hide comments
@@ -1,10 +1,14
1 #!/bin/bash
1 #!/bin/bash
2 mkdir build
2 mkdir build
3 cd build
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 meson --prefix=/usr ..
8 meson --prefix=/usr ..
5 ninja
9 ninja
6 DESTDIR=AppDir ninja install
10 DESTDIR=$(pwd)/AppDir ninja install
7 mv AppDir/usr/lib64 AppDir/usr/lib
11 mv AppDir/usr/lib64 AppDir/usr/lib
8 wget https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
12 wget https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
9 chmod +x linuxdeployqt-continuous-x86_64.AppImage && ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract
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
Show file before | Show file after | Hide comments
@@ -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