summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-03-04 18:47:28 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2020-03-04 18:47:28 +0200
commiteac05d8dd8aa4aa032ecf59b41774dc8aa84c68b (patch)
tree8149fe7af132fb11e301a0461582c6c0d2872527
parent6321ec00db639d64db5a18eb3b70f24446897e19 (diff)
Install executables.
Change-Id: I94a9f31326f040b8658aed35853eb29aff33135d
-rw-r--r--codemaker/meson.build1
-rw-r--r--desktop/meson.build4
-rw-r--r--idl/meson.build1
-rw-r--r--idlc/meson.build1
-rw-r--r--pyuno/meson.build1
-rw-r--r--sal/meson.build13
-rw-r--r--smoketest/meson.build1
-rw-r--r--tools/meson.build1
-rw-r--r--unoidl/meson.build3
-rw-r--r--vcl/meson.build3
10 files changed, 24 insertions, 5 deletions
diff --git a/codemaker/meson.build b/codemaker/meson.build
index 28726221be81..6c5c750786d7 100644
--- a/codemaker/meson.build
+++ b/codemaker/meson.build
@@ -20,5 +20,6 @@ cppumaker_exe = executable('cppumaker',
include_directories: [main_inc],
cpp_args: ['-DLIBO_INTERNAL_ONLY'],
link_with: [codemaker_st_lib, unoidl_lib, salhelper_lib, sal_lib],
+ install: true,
)
diff --git a/desktop/meson.build b/desktop/meson.build
index 5fb6e4291a79..5721ccfde375 100644
--- a/desktop/meson.build
+++ b/desktop/meson.build
@@ -81,18 +81,21 @@ sofficeapp_lib = shared_library('sofficeapp',
soffice_bin = executable('soffice', 'source/app/main.c',
include_directories: [main_inc],
link_with: [sofficeapp_lib, sal_lib],
+ install: true,
)
minidump_bin = executable('minidump_upload',
'source/minidump/minidump_upload.cxx',
include_directories: [main_inc],
link_with: [crashreport_lib, sal_lib],
+ install: true,
)
unopkg_bin = executable('unopkg',
'source/pkgchk/unopkg/unopkg_main.c',
include_directories: [main_inc],
link_with: [sal_lib, comphelper_lib, tl_lib, unopkgapp_lib],
+ install: true,
)
oosplash_bin = executable('oosplash',
@@ -103,4 +106,5 @@ oosplash_bin = executable('oosplash',
'unx/source/start.c',
include_directories: [main_inc],
link_with: [sal_lib],
+ install: true,
) \ No newline at end of file
diff --git a/idl/meson.build b/idl/meson.build
index 7cc1991b7162..0fc786805db4 100644
--- a/idl/meson.build
+++ b/idl/meson.build
@@ -16,4 +16,5 @@ svidl_bin = executable('svidl',
cpp_args: ['-DLIBO_INTERNAL_ONLY'],
include_directories: [main_inc, 'inc', udkh_inc, offapi_inc],
link_with: [tl_lib, sal_lib],
+ install: true,
)
diff --git a/idlc/meson.build b/idlc/meson.build
index 0f3c1c8eb8d2..5accbd525607 100644
--- a/idlc/meson.build
+++ b/idlc/meson.build
@@ -34,4 +34,5 @@ idlc = executable('idlc',
'-DSYSTEM_UCPP',
'-DUCPP="file:///usr/bin/ucpp"'],
link_with: [reg_lib, sal_lib],
+ install: true,
)
diff --git a/pyuno/meson.build b/pyuno/meson.build
index 4adc62e81b48..9341ccb09b66 100644
--- a/pyuno/meson.build
+++ b/pyuno/meson.build
@@ -42,5 +42,6 @@ if host_machine.system() == 'windows'
cpp_args: ['-DLIBO_INTERNAL_ONLY'],
include_directories: [main_inc, 'inc'],
link_with: [oopathutils_lib],
+ install: true,
)
endif
diff --git a/sal/meson.build b/sal/meson.build
index 9b709c5ff46f..84cd07cd2670 100644
--- a/sal/meson.build
+++ b/sal/meson.build
@@ -139,7 +139,8 @@ if cppunit_dep.found()
include_directories: [main_inc],
cpp_args: ['-DLIBO_INTERNAL_ONLY'],
link_with: sal_lib,
- dependencies: [cppunit_dep]
+ dependencies: [cppunit_dep],
+ install: true,
)
plib = shared_library('osl_test',
@@ -148,18 +149,22 @@ if cppunit_dep.found()
link_with: sal_lib,
dependencies: [cppunit_dep, thread_dep],
include_directories: [main_inc],
- install: true,
+ install: true,
)
test('sal_test', unittester,
args: [plib])
#pc = executable('process_child', 'qa/osl/process/osl_process_child.cxx',
- # dependencies: [])
+ # dependencies: []
+ #)
test('osl_security', executable('osl_security', 'qa/osl/security/osl_Security.cxx',
include_directories: [main_inc],
cpp_args: ['-DLIBO_INTERNAL_ONLY'],
link_with: sal_lib,
- dependencies: [cppunit_dep]))
+ dependencies: [cppunit_dep],
+ install: true,
+ )
+ )
endif
diff --git a/smoketest/meson.build b/smoketest/meson.build
index ac7a5af0fe01..1a7a61c86542 100644
--- a/smoketest/meson.build
+++ b/smoketest/meson.build
@@ -14,4 +14,5 @@ libtest_bin = executable('libtest',
udk_fake_h, off_fake_h,
include_directories: [main_inc, udkh_inc, offapi_inc],
dependencies: [dl_dep],
+ install: true,
)
diff --git a/tools/meson.build b/tools/meson.build
index f5c2910b7db6..cc22c115457c 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -59,6 +59,7 @@ bestreversemap_exe = executable('bestreversemap',
'source/reversemap/bestreversemap.cxx',
include_directories: [main_inc],
link_with: [sal_lib],
+ install: true,
)
# FIXME, add custom target to generate reverse map.
diff --git a/unoidl/meson.build b/unoidl/meson.build
index cd69ec3181e7..b62225609732 100644
--- a/unoidl/meson.build
+++ b/unoidl/meson.build
@@ -27,6 +27,7 @@ executable('unoidl-check',
include_directories: [main_inc],
cpp_args: ['-DLIBO_INTERNAL_ONLY'],
link_with: [unoidl_lib, salhelper_lib, sal_lib],
+ install: true,
)
executable('unoidl-read',
@@ -34,6 +35,7 @@ executable('unoidl-read',
include_directories: [main_inc],
cpp_args: ['-DLIBO_INTERNAL_ONLY'],
link_with: [unoidl_lib, salhelper_lib, sal_lib],
+ install: true,
)
unoidl_write_exe = executable('unoidl-write',
@@ -41,4 +43,5 @@ unoidl_write_exe = executable('unoidl-write',
include_directories: [main_inc],
cpp_args: ['-DLIBO_INTERNAL_ONLY'],
link_with: [unoidl_lib, salhelper_lib, sal_lib],
+ install: true,
)
diff --git a/vcl/meson.build b/vcl/meson.build
index fa86c7e562e8..e370b72cad99 100644
--- a/vcl/meson.build
+++ b/vcl/meson.build
@@ -479,5 +479,6 @@ executable('svdem',
udk_fake_h, off_fake_h,
cpp_args: ['-DLIBO_INTERNAL_ONLY'],
include_directories: [main_inc, udkh_inc, offapi_inc],
- link_with: [tl_lib, sal_lib, vcl_lib, cppu_lib, cppuhelper_lib, comphelper_lib]
+ link_with: [tl_lib, sal_lib, vcl_lib, cppu_lib, cppuhelper_lib, comphelper_lib],
+ install: true,
)