diff options
author | Andrea Pappacoda <[email protected]> | 2024-08-28 16:35:38 +0200 |
---|---|---|
committer | MITSUNARI Shigeo <[email protected]> | 2024-08-29 09:44:16 +0900 |
commit | 38e5e7b93197de8a73f053cd4bb7acb865e5040b (patch) | |
tree | 39663e3fe93df38aeded388040d1b13c6ce72866 | |
parent | 9dabf91d285efb25e80894671a5c811b218ccb68 (diff) | |
download | xbyak-38e5e7b93197de8a73f053cd4bb7acb865e5040b.tar.gz xbyak-38e5e7b93197de8a73f053cd4bb7acb865e5040b.zip |
Revert move of .pc and .cmake files to arch-independent dirs
This reverts commit 6c593b9a10e450f342efc1cf871dbcf7bb3612fe,
9f535729159baf467c3bd8dc7ec017a40289a12c, and
c7c1eac070851068d7adc3a67ad2efd196145687
Closes: #189
-rw-r--r-- | meson.build | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/meson.build b/meson.build index 6a04b92..11458fd 100644 --- a/meson.build +++ b/meson.build @@ -22,19 +22,15 @@ import('pkgconfig').generate( name: meson.project_name(), description: 'JIT assembler for x86(IA32), x64(AMD64, x86-64)', version: meson.project_version(), - url: 'https://github.com/herumi/xbyak', - install_dir: get_option('datadir')/'pkgconfig' + url: 'https://github.com/herumi/xbyak' ) -if meson.version().version_compare('>=0.62.0') +if meson.version().version_compare('>=0.50.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 + version: meson.project_version() ) cmake_conf = configuration_data() @@ -44,7 +40,6 @@ if meson.version().version_compare('>=0.62.0') cmake.configure_package_config_file( name: meson.project_name(), input: 'cmake'/'meson-config.cmake.in', - configuration: cmake_conf, - install_dir: shared_cmake_dir, + configuration: cmake_conf ) endif |