diff options
author | MITSUNARI Shigeo <[email protected]> | 2024-03-15 11:05:14 +0900 |
---|---|---|
committer | MITSUNARI Shigeo <[email protected]> | 2024-03-15 11:05:14 +0900 |
commit | 80477f635345e8f13efc512d84b01b94cad92cd9 (patch) | |
tree | 9ead028741e6712814e6107aecb09e42031f8f7c | |
parent | fc183427e852a70fb98add1ba640020a53034bb0 (diff) | |
parent | 6c593b9a10e450f342efc1cf871dbcf7bb3612fe (diff) | |
download | xbyak-80477f635345e8f13efc512d84b01b94cad92cd9.tar.gz xbyak-80477f635345e8f13efc512d84b01b94cad92cd9.zip |
Merge branch 'dev'
-rw-r--r-- | meson.build | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/meson.build b/meson.build index dfecf17..f523c15 100644 --- a/meson.build +++ b/meson.build @@ -10,8 +10,7 @@ project( default_options: 'b_ndebug=if-release' ) -include_dir = get_option('prefix') / get_option('includedir') -install_subdir('xbyak', install_dir: include_dir) +install_subdir('xbyak', install_dir: get_option('includedir')) xbyak_dep = declare_dependency(include_directories: include_directories('.')) @@ -24,18 +23,18 @@ import('pkgconfig').generate( description: 'JIT assembler for x86(IA32), x64(AMD64, x86-64)', version: meson.project_version(), url: 'https://github.com/herumi/xbyak', - variables: ['includedir=@0@'.format(include_dir)], - dataonly: true, + install_dir: get_option('datadir')/'pkgconfig' ) -shared_cmake_dir = get_option('prefix') / 'share/cmake/xbyak' -if meson.version().version_compare('>=0.50.0') +if meson.version().version_compare('>=0.62.0') cmake = import('cmake') + shared_cmake_dir = get_option('datadir')/'cmake'/meson.project_name() cmake.write_basic_package_version_file( name: meson.project_name(), version: meson.project_version(), install_dir: shared_cmake_dir, + arch_independent: true ) cmake_conf = configuration_data() |