From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/waylandpp: fix build with cmake < 3.13
Date: Sat, 23 Nov 2019 10:44:37 +0100 [thread overview]
Message-ID: <20191123094437.GP32494@scaer> (raw)
In-Reply-To: <20191122180957.618327-1-fontaine.fabrice@gmail.com>
Fabrice, All,
On 2019-11-22 19:09 +0100, Fabrice Fontaine spake thusly:
> Fixes:
> - http://autobuild.buildroot.org/results/587fb44ea2272bd134262716870f5ad36a18661d
Applied to master, thanks.
Regards,
Yann E. MORIN.
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> ...ke-Make-target_link_options-optional.patch | 37 +++++++++++++++++++
> 1 file changed, 37 insertions(+)
> create mode 100644 package/waylandpp/0001-cmake-Make-target_link_options-optional.patch
>
> diff --git a/package/waylandpp/0001-cmake-Make-target_link_options-optional.patch b/package/waylandpp/0001-cmake-Make-target_link_options-optional.patch
> new file mode 100644
> index 0000000000..a7746c1f36
> --- /dev/null
> +++ b/package/waylandpp/0001-cmake-Make-target_link_options-optional.patch
> @@ -0,0 +1,37 @@
> +From a39c0c115e19150551c01b04a5e903376633e771 Mon Sep 17 00:00:00 2001
> +From: Nils Christopher Brause <nilschrbrause@googlemail.com>
> +Date: Fri, 22 Nov 2019 17:39:20 +0100
> +Subject: [PATCH] [cmake] Make target_link_options optional, lowering the
> + required cmake version to 3.4.
> +
> +[Retrieved from:
> +https://github.com/NilsBrause/waylandpp/commit/a39c0c115e19150551c01b04a5e903376633e771]
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +---
> + CMakeLists.txt | 6 ++++--
> + 1 file changed, 4 insertions(+), 2 deletions(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index 386f8d8..47a412c 100644
> +--- a/CMakeLists.txt
> ++++ b/CMakeLists.txt
> +@@ -21,7 +21,7 @@
> + # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
> + # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> +
> +-cmake_minimum_required(VERSION 3.13)
> ++cmake_minimum_required(VERSION 3.4)
> + project(waylandpp VERSION 0.2.7 LANGUAGES CXX)
> +
> + # packages
> +@@ -160,7 +160,9 @@ if(BUILD_LIBRARIES)
> + "include/wayland-client.hpp;include/wayland-util.hpp;${CMAKE_CURRENT_BINARY_DIR}/wayland-client-protocol.hpp;${CMAKE_CURRENT_BINARY_DIR}/wayland-version.hpp"
> + src/wayland-client.cpp src/wayland-util.cpp wayland-client-protocol.cpp wayland-client-protocol.hpp)
> + # Report undefined references only for the base library.
> +- target_link_options(wayland-client++ PRIVATE "-Wl,--no-undefined")
> ++ if(${CMAKE_VERSION} VERSION_GREATER "3.14.0")
> ++ target_link_options(wayland-client++ PRIVATE "-Wl,--no-undefined")
> ++ endif()
> + define_library(wayland-client-extra++ "${WAYLAND_CLIENT_CFLAGS}" "${WAYLAND_CLIENT_LIBRARIES}"
> + "${CMAKE_CURRENT_BINARY_DIR}/wayland-client-protocol-extra.hpp"
> + wayland-client-protocol-extra.cpp wayland-client-protocol-extra.hpp wayland-client-protocol.hpp)
> --
> 2.24.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
prev parent reply other threads:[~2019-11-23 9:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-22 18:09 [Buildroot] [PATCH 1/1] package/waylandpp: fix build with cmake < 3.13 Fabrice Fontaine
2019-11-23 9:44 ` Yann E. MORIN [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191123094437.GP32494@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox