diff options
| -rw-r--r-- | include/libcamera/ipa/meson.build | 8 | ||||
| -rw-r--r-- | src/libcamera/meson.build | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build index 3352d08f..96fca42c 100644 --- a/include/libcamera/ipa/meson.build +++ b/include/libcamera/ipa/meson.build @@ -11,8 +11,6 @@ libcamera_ipa_headers = files([ install_headers(libcamera_ipa_headers, subdir : libcamera_ipa_include_dir) -libcamera_generated_ipa_headers = [] - ipa_headers_install_dir = get_option('includedir') / libcamera_ipa_include_dir # @@ -31,7 +29,7 @@ ipa_mojom_core = custom_target(core_mojom_file.split('.')[0] + '_mojom_module', ]) # core_ipa_interface.h -libcamera_generated_ipa_headers += custom_target('core_ipa_interface_h', +libcamera_ipa_headers += custom_target('core_ipa_interface_h', input : ipa_mojom_core, output : 'core_ipa_interface.h', depends : mojom_templates, @@ -47,7 +45,7 @@ libcamera_generated_ipa_headers += custom_target('core_ipa_interface_h', ]) # core_ipa_serializer.h -libcamera_generated_ipa_headers += custom_target('core_ipa_serializer_h', +libcamera_ipa_headers += custom_target('core_ipa_serializer_h', input : ipa_mojom_core, output : 'core_ipa_serializer.h', depends : mojom_templates, @@ -152,7 +150,7 @@ foreach pipeline, file : pipeline_ipa_mojom_mapping 'mojom': mojom, } - libcamera_generated_ipa_headers += [header, serializer, proxy_header] + libcamera_ipa_headers += [header, serializer, proxy_header] endforeach ipa_mojom_files = [] diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 61a97c73..86e8b88c 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -55,7 +55,6 @@ libcamera_internal_sources = files([ ]) libcamera_public_sources += libcamera_public_headers -libcamera_internal_sources += libcamera_generated_ipa_headers libcamera_internal_sources += libcamera_tracepoint_header includes = [ @@ -196,6 +195,7 @@ libcamera_deps += [ libcamera = shared_library('libcamera', [ libcamera_public_sources, + libcamera_ipa_headers, libcamera_internal_sources, ], version : libcamera_version, @@ -216,7 +216,6 @@ libcamera_public = declare_dependency(sources : [ # Internal dependency for components and plugins which can use private APIs libcamera_private = declare_dependency(sources : [ libcamera_ipa_headers, - libcamera_generated_ipa_headers, ], dependencies : [ libcamera_public, |