{"id":1262,"url":"https://patchwork.libcamera.org/api/patches/1262/?format=json","web_url":"https://patchwork.libcamera.org/patch/1262/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190522212253.3307-2-laurent.pinchart@ideasonboard.com>","date":"2019-05-22T21:22:52","name":"[libcamera-devel,v3,2/3] meson: Create and use a dependency for libcamera and its headers","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"cf55ce4bd6b4b43556ab52cd79b88c90568a0d81","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1262/mbox/","series":[{"id":318,"url":"https://patchwork.libcamera.org/api/series/318/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=318","date":"2019-05-22T21:22:51","name":"[libcamera-devel,v3,1/3] meson: Fix coding style in meson.build files","version":3,"mbox":"https://patchwork.libcamera.org/series/318/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1262/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1262/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4666D60C02\n\tfor ;\n\tWed, 22 May 2019 23:23:14 +0200 (CEST)","from pendragon.bb.dnainternet.fi\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id CA38C52F\n\tfor ;\n\tWed, 22 May 2019 23:23:13 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1558560193;\n\tbh=M7l+NtP5cj+r6ermizYqosD56G+EGr7MonwkYHOvruw=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=T3ulzSxxaoMygO3EeR7iDxFmvx//cSFqaja3YxJ8yE6V6ngnNkwavAw+7hN9b1+yK\n\tJwQ9wXfqcdgLukBSZkn8Zar1FLLh/SCVwMpg67bhZ63C/gY8UIrE3HUMoHI9bGSl6u\n\t5htq3/At1PABdSAWZV9GhCrCnbpNPpdJG9nNx71w=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 23 May 2019 00:22:52 +0300","Message-Id":"<20190522212253.3307-2-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190522212253.3307-1-laurent.pinchart@ideasonboard.com>","References":"<20190522212253.3307-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 2/3] meson: Create and use a dependency\n\tfor libcamera and its headers","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Wed, 22 May 2019 21:23:14 -0000"},"content":"Instead of manually adding the libcamera library and include path to\nevery target that requires it, declare a dependency that groups the\nheaders as source, the library and the include path, and use it through\nthe project. This simplifies handling of the dependency.\n\nSigned-off-by: Laurent Pinchart \n---\n src/cam/meson.build | 5 ++---\n src/libcamera/meson.build | 4 ++++\n src/qcam/meson.build | 4 +---\n test/camera/meson.build | 1 +\n test/ipa/meson.build | 2 ++\n test/libtest/meson.build | 3 +--\n test/media_device/meson.build | 2 ++\n test/meson.build | 2 ++\n test/pipeline/ipu3/meson.build | 1 +\n test/v4l2_device/meson.build | 1 +\n test/v4l2_subdevice/meson.build | 1 +\n 11 files changed, 18 insertions(+), 8 deletions(-)","diff":"diff --git a/src/cam/meson.build b/src/cam/meson.build\nindex 851295091d0d..3faddc6c8d85 100644\n--- a/src/cam/meson.build\n+++ b/src/cam/meson.build\n@@ -6,6 +6,5 @@ cam_sources = files([\n ])\n \n cam = executable('cam', cam_sources,\n- link_with : libcamera,\n- install : true,\n- include_directories : libcamera_includes)\n+ dependencies : libcamera_dep,\n+ install : true)\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 8294ed357154..0ebb25bcb821 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -65,3 +65,7 @@ libcamera = shared_library('camera',\n install : true,\n include_directories : includes,\n dependencies : libudev)\n+\n+libcamera_dep = declare_dependency(sources : libcamera_api,\n+ include_directories : libcamera_includes,\n+ link_with : libcamera)\ndiff --git a/src/qcam/meson.build b/src/qcam/meson.build\nindex 56b57a266b29..9f1fa75f9813 100644\n--- a/src/qcam/meson.build\n+++ b/src/qcam/meson.build\n@@ -15,9 +15,7 @@ qt5_dep = dependency('qt5',\n \n if qt5_dep.found()\n qcam = executable('qcam', qcam_sources,\n- link_with : libcamera,\n install : true,\n- include_directories : libcamera_includes,\n- dependencies : qt5_dep,\n+ dependencies : [libcamera_dep, qt5_dep],\n cpp_args : '-DQT_NO_KEYWORDS')\n endif\ndiff --git a/test/camera/meson.build b/test/camera/meson.build\nindex b01e7e025de1..35e97ce5de1a 100644\n--- a/test/camera/meson.build\n+++ b/test/camera/meson.build\n@@ -9,6 +9,7 @@ camera_tests = [\n \n foreach t : camera_tests\n exe = executable(t[0], [t[1], 'camera_test.cpp'],\n+ dependencies : libcamera_dep,\n link_with : test_libraries,\n include_directories : test_includes_internal)\n test(t[0], exe, suite : 'camera', is_parallel : false)\ndiff --git a/test/ipa/meson.build b/test/ipa/meson.build\nindex 53015e38381f..ecde313c6dc5 100644\n--- a/test/ipa/meson.build\n+++ b/test/ipa/meson.build\n@@ -5,6 +5,7 @@ ipa_modules_sources = [\n \n foreach m : ipa_modules_sources\n shared_library(m, name_prefix : '',\n+ dependencies : libcamera_dep,\n include_directories : test_includes_public)\n endforeach\n \n@@ -14,6 +15,7 @@ ipa_test = [\n \n foreach t : ipa_test\n exe = executable(t[0], t[1],\n+ dependencies : libcamera_dep,\n link_with : test_libraries,\n include_directories : test_includes_internal)\n \ndiff --git a/test/libtest/meson.build b/test/libtest/meson.build\nindex e0893b70c3d4..112debbce30f 100644\n--- a/test/libtest/meson.build\n+++ b/test/libtest/meson.build\n@@ -6,11 +6,10 @@ libtest = static_library('libtest', libtest_sources)\n \n libtest_includes = include_directories('.')\n \n-test_libraries = [libcamera, libtest]\n+test_libraries = [libtest]\n \n test_includes_public = [\n libtest_includes,\n- libcamera_includes,\n ]\n \n test_includes_internal = [\ndiff --git a/test/media_device/meson.build b/test/media_device/meson.build\nindex 124f454ec865..6a0e468434b5 100644\n--- a/test/media_device/meson.build\n+++ b/test/media_device/meson.build\n@@ -9,10 +9,12 @@ media_device_tests = [\n ]\n \n lib_mdev_test = static_library('lib_mdev_test', lib_mdev_test_sources,\n+ dependencies : libcamera_dep,\n include_directories : test_includes_internal)\n \n foreach t : media_device_tests\n exe = executable(t[0], t[1],\n+ dependencies : libcamera_dep,\n link_with : [test_libraries, lib_mdev_test],\n include_directories : test_includes_internal)\n \ndiff --git a/test/meson.build b/test/meson.build\nindex ef4136793f03..609aeab80e7d 100644\n--- a/test/meson.build\n+++ b/test/meson.build\n@@ -21,6 +21,7 @@ internal_tests = [\n \n foreach t : public_tests\n exe = executable(t[0], t[1],\n+ dependencies : libcamera_dep,\n link_with : test_libraries,\n include_directories : test_includes_public)\n \n@@ -29,6 +30,7 @@ endforeach\n \n foreach t : internal_tests\n exe = executable(t[0], t[1],\n+ dependencies : libcamera_dep,\n link_with : test_libraries,\n include_directories : test_includes_internal)\n \ndiff --git a/test/pipeline/ipu3/meson.build b/test/pipeline/ipu3/meson.build\nindex 87074588c651..d02927c9af86 100644\n--- a/test/pipeline/ipu3/meson.build\n+++ b/test/pipeline/ipu3/meson.build\n@@ -4,6 +4,7 @@ ipu3_test = [\n \n foreach t : ipu3_test\n exe = executable(t[0], t[1],\n+ dependencies : libcamera_dep,\n link_with : test_libraries,\n include_directories : test_includes_internal)\n \ndiff --git a/test/v4l2_device/meson.build b/test/v4l2_device/meson.build\nindex 32556cf5ea18..de540b1ba6f5 100644\n--- a/test/v4l2_device/meson.build\n+++ b/test/v4l2_device/meson.build\n@@ -11,6 +11,7 @@ v4l2_device_tests = [\n \n foreach t : v4l2_device_tests\n exe = executable(t[0], [t[1], 'v4l2_device_test.cpp'],\n+ dependencies : libcamera_dep,\n link_with : test_libraries,\n include_directories : test_includes_internal)\n test(t[0], exe, suite : 'v4l2_device', is_parallel : false)\ndiff --git a/test/v4l2_subdevice/meson.build b/test/v4l2_subdevice/meson.build\nindex 282f6e234ec1..0521984b2a78 100644\n--- a/test/v4l2_subdevice/meson.build\n+++ b/test/v4l2_subdevice/meson.build\n@@ -5,6 +5,7 @@ v4l2_subdevice_tests = [\n \n foreach t : v4l2_subdevice_tests\n exe = executable(t[0], [t[1], 'v4l2_subdevice_test.cpp'],\n+ dependencies : libcamera_dep,\n link_with : test_libraries,\n include_directories : test_includes_internal)\n test(t[0], exe, suite : 'v4l2_subdevice', is_parallel : false)\n","prefixes":["libcamera-devel","v3","2/3"]}