diff options
| author | MITSUNARI Shigeo <[email protected]> | 2021-10-12 16:09:21 +0900 |
|---|---|---|
| committer | MITSUNARI Shigeo <[email protected]> | 2021-10-12 16:09:21 +0900 |
| commit | 47cf85fdba463135a18c4924f5d82b14cb4e0068 (patch) | |
| tree | 66589bd03a42567e70abf87a41f31cdd91e3e665 | |
| parent | 2cc21925f3aff4f2dc4a5c6f27430e8491637442 (diff) | |
| parent | b29e471ea5d31e9384b5f77dd2af9e7ee215d92b (diff) | |
| download | xbyak-47cf85fdba463135a18c4924f5d82b14cb4e0068.tar.gz xbyak-47cf85fdba463135a18c4924f5d82b14cb4e0068.zip | |
fix conflict
| -rw-r--r-- | cmake/meson-config.cmake.in | 2 | ||||
| -rw-r--r-- | meson.build | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cmake/meson-config.cmake.in b/cmake/meson-config.cmake.in index 9aeef78..3fdb3e7 100644 --- a/cmake/meson-config.cmake.in +++ b/cmake/meson-config.cmake.in @@ -3,6 +3,6 @@ if(NOT TARGET @TARGET_NAME@) add_library(@TARGET_NAME@ INTERFACE IMPORTED) set_target_properties(@TARGET_NAME@ PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_LIST_FILE}/include" + INTERFACE_INCLUDE_DIRECTORIES "@ABSOLUTE_INCLUDE_DIR@" ) endif() diff --git a/meson.build b/meson.build index 11d68d8..c699787 100644 --- a/meson.build +++ b/meson.build @@ -35,6 +35,7 @@ if meson.version().version_compare('>=0.50.0') cmake_conf = configuration_data() cmake_conf.set('TARGET_NAME', meson.project_name() + '::' + meson.project_name()) + cmake_conf.set('ABSOLUTE_INCLUDE_DIR', get_option('prefix')/get_option('includedir')) cmake.configure_package_config_file( name: meson.project_name(), |