diff options
| author | Jan-Marek Glogowski <jan-marek.glogowski@extern.cib.de> | 2020-02-22 22:38:26 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-04-07 16:17:21 +0000 |
| commit | 93e196ebe8e2dabc2f511c571a84327bd1149d6c (patch) | |
| tree | 505c2c587e0b6312e8a4a29e13c5f6baec97db0b | |
| parent | 9f16a52c7e50b66f2bed1fff5b483f3318c5a993 (diff) | |
Add (manual) instdir support
Change-Id: Ie9f22abf0fb6432573b7524fdebb48548f4bb04c
| -rw-r--r-- | codemaker/meson.build | 1 | ||||
| -rw-r--r-- | external/clew/meson.build | 1 | ||||
| -rw-r--r-- | idlc/meson.build | 1 | ||||
| -rw-r--r-- | meson.build | 8 | ||||
| -rw-r--r-- | sw/meson.build | 2 |
5 files changed, 10 insertions, 3 deletions
diff --git a/codemaker/meson.build b/codemaker/meson.build index 6c5c750786d7..2eae937c1749 100644 --- a/codemaker/meson.build +++ b/codemaker/meson.build @@ -21,5 +21,6 @@ cppumaker_exe = executable('cppumaker', cpp_args: ['-DLIBO_INTERNAL_ONLY'], link_with: [codemaker_st_lib, unoidl_lib, salhelper_lib, sal_lib], install: true, + install_dir: 'sdk/bin', ) diff --git a/external/clew/meson.build b/external/clew/meson.build index 4e41bb01eb2a..653144a07e47 100644 --- a/external/clew/meson.build +++ b/external/clew/meson.build @@ -2,6 +2,7 @@ clew_lib = shared_library('clewlo', 'source/clew.c', include_directories: ['source/include'], dependencies: [dl_dep], + install: true, ) clew_dep = declare_dependency(link_with: clew_lib, diff --git a/idlc/meson.build b/idlc/meson.build index 5accbd525607..9006c29736eb 100644 --- a/idlc/meson.build +++ b/idlc/meson.build @@ -35,4 +35,5 @@ idlc = executable('idlc', '-DUCPP="file:///usr/bin/ucpp"'], link_with: [reg_lib, sal_lib], install: true, + install_dir: 'sdk/bin', ) diff --git a/meson.build b/meson.build index 7c3691f5e8eb..7b5b5ca3eefc 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,12 @@ project('libreoffice', 'c', 'cpp', version: '1.2.3', - default_options: ['cpp_std=c++17']) + default_options: [ + 'cpp_std=c++17', + 'prefix=' + meson.source_root() + '/instdir', + 'bindir=program', + 'libdir=program', + ] +) varr = meson.project_version().split('.') major_version = varr[0] diff --git a/sw/meson.build b/sw/meson.build index d031ffdc1be9..41bae18a6992 100644 --- a/sw/meson.build +++ b/sw/meson.build @@ -881,7 +881,6 @@ swui_lib = shared_library('swuilo', install: true, ) - msword_lib = shared_library('mswordlo', 'source/filter/docx/swdocxreader.cxx', 'source/filter/rtf/swparrtf.cxx', @@ -1050,6 +1049,5 @@ vbaswobj_lib = shared_library('vbaswobjlo', vcl_lib ], dependencies: [libxml_dep], - install: true, ) |