All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jan Heylen <heyleke@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 2/2] opentracing-cpp: make shared/static target a configurable option
Date: Sat, 23 Dec 2017 08:40:02 +0100	[thread overview]
Message-ID: <1514014802-23736-3-git-send-email-heyleke@gmail.com> (raw)
In-Reply-To: <1514014802-23736-1-git-send-email-heyleke@gmail.com>

From: Jan Heylen <jan.heylen@nokia.com>

Signed-off-by: Jan Heylen <jan.heylen@nokia.com>

---
Changes v1 -> v2:
  - v1: no patch include, v2: include extra patch to make shared/static configurable

---
 ...shared-static-target-a-configurable-optio.patch | 73 ++++++++++++++++++++++
 package/opentracing-cpp/opentracing-cpp.mk         |  8 +++
 2 files changed, 81 insertions(+)
 create mode 100644 package/opentracing-cpp/0001-CMake-make-shared-static-target-a-configurable-optio.patch

diff --git a/package/opentracing-cpp/0001-CMake-make-shared-static-target-a-configurable-optio.patch b/package/opentracing-cpp/0001-CMake-make-shared-static-target-a-configurable-optio.patch
new file mode 100644
index 0000000..1323f3f
--- /dev/null
+++ b/package/opentracing-cpp/0001-CMake-make-shared-static-target-a-configurable-optio.patch
@@ -0,0 +1,73 @@
+From 9462847f23a25524fdc2112cbc8de3f2c02a1669 Mon Sep 17 00:00:00 2001
+From: Jan Heylen <jan.heylen@nokia.com>
+Date: Fri, 22 Dec 2017 22:04:29 +0100
+Subject: [PATCH] CMake: make shared/static target a configurable option
+
+---
+ CMakeLists.txt | 40 ++++++++++++++++++++++++++++------------
+ 1 file changed, 28 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aadf2f9..d03bd00 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -70,18 +70,36 @@ endif()
+ include_directories(include)
+ include_directories(SYSTEM 3rd_party/include)
+ 
++option(BUILD_SHARED_LIBS "Build as a shared library" ON)
++option(BUILD_STATIC_LIBS "Build as a static library" ON)
++
++if (NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS)
++    message(FATAL_ERROR "One or both of BUILD_SHARED_LIBS or BUILD_STATIC_LIBS must be set to ON to build")
++endif()
++
+ set(SRCS src/propagation.cpp src/noop.cpp src/tracer.cpp)
+-add_library(opentracing SHARED ${SRCS})
+-target_include_directories(opentracing INTERFACE "$<INSTALL_INTERFACE:include/>")
+-set_target_properties(opentracing PROPERTIES VERSION ${OPENTRACING_VERSION_STRING}
++
++if (BUILD_SHARED_LIBS)
++  add_library(opentracing SHARED ${SRCS})
++  target_include_directories(opentracing INTERFACE "$<INSTALL_INTERFACE:include/>")
++  set_target_properties(opentracing PROPERTIES VERSION ${OPENTRACING_VERSION_STRING}
+                                              SOVERSION ${OPENTRACING_VERSION_MAJOR})
+-add_library(opentracing-static STATIC ${SRCS})
+-set_target_properties(opentracing-static PROPERTIES OUTPUT_NAME opentracing)
+-target_include_directories(opentracing-static INTERFACE "$<INSTALL_INTERFACE:include/>")
+-if (CLANG_TIDY_EXE)
+-  set_target_properties(opentracing PROPERTIES
++  install(TARGETS opentracing EXPORT OpenTracingTargets
++          LIBRARY DESTINATION lib
++          ARCHIVE DESTINATION lib)
++  if (CLANG_TIDY_EXE)
++    set_target_properties(opentracing PROPERTIES
+                                     CXX_CLANG_TIDY "${DO_CLANG_TIDY}")
+-endif()
++  endif()
++endif(BUILD_SHARED_LIBS)
++
++if (BUILD_STATIC_LIBS)
++  add_library(opentracing-static STATIC ${SRCS})
++  set_target_properties(opentracing-static PROPERTIES OUTPUT_NAME opentracing)
++  target_include_directories(opentracing-static INTERFACE "$<INSTALL_INTERFACE:include/>")
++  install(TARGETS opentracing-static EXPORT OpenTracingTargets
++          ARCHIVE DESTINATION lib)
++endif(BUILD_STATIC_LIBS)
+ 
+ 
+ install(DIRECTORY 3rd_party/include/opentracing DESTINATION include
+@@ -89,9 +107,7 @@ install(DIRECTORY 3rd_party/include/opentracing DESTINATION include
+                            PATTERN "*.h")
+ install(DIRECTORY include/opentracing DESTINATION include
+             FILES_MATCHING PATTERN "*.h")
+-install(TARGETS opentracing opentracing-static EXPORT OpenTracingTargets
+-        LIBRARY DESTINATION lib
+-        ARCHIVE DESTINATION lib)
++
+ 
+ # ==============================================================================
+ # Package configuration setup
+-- 
+2.7.4
+
diff --git a/package/opentracing-cpp/opentracing-cpp.mk b/package/opentracing-cpp/opentracing-cpp.mk
index f1748ef..9043966 100644
--- a/package/opentracing-cpp/opentracing-cpp.mk
+++ b/package/opentracing-cpp/opentracing-cpp.mk
@@ -11,4 +11,12 @@ OPENTRACING_CPP_LICENSE_FILES = COPYING
 
 OPENTRACING_CPP_INSTALL_STAGING = YES
 
+ifeq ($(BR2_STATIC_LIBS),y)
+	OPENTRACING_CPP_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
+else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+	OPENTRACING_CPP_CONF_OPTS += -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON
+else ifeq ($(BR2_SHARED_LIBS),y)
+	OPENTRACING_CPP_CONF_OPTS += -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
+endif
+
 $(eval $(cmake-package))
-- 
2.7.4

  parent reply	other threads:[~2017-12-23  7:40 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-21  9:41 [Buildroot] Opentracing-cpp package heyleke at gmail.com
2017-12-21  9:41 ` [Buildroot] [PATCH] Opentracing: add opentracing-cpp v1.2.0 package heyleke at gmail.com
2017-12-22 15:00   ` Samuel Martin
2017-12-22 15:20     ` Jan Heylen
2017-12-23  7:40   ` [Buildroot] [PATCH v2 0/2] Opentracing-cpp: new package Jan Heylen
2017-12-23  7:40     ` [Buildroot] [PATCH v2 1/2] Opentracing: add opentracing-cpp v1.2.0 package Jan Heylen
2017-12-30 21:46       ` Thomas Petazzoni
2017-12-30 21:49         ` Jan Heylen
2017-12-31  9:23           ` Jan Heylen
2017-12-31 10:46             ` Jan Heylen
2017-12-31 13:23               ` Jan Heylen
2017-12-31 16:10                 ` Thomas Petazzoni
2017-12-31 17:57                   ` Jan Heylen
2018-01-03  8:52       ` [Buildroot] [PATCH v3 0/1] Opentracing-cpp: new package Jan Heylen
2018-01-03  8:52         ` [Buildroot] [PATCH v3 1/1] opentracing-cpp: " Jan Heylen
2018-01-03  9:03           ` Baruch Siach
2018-01-03  9:07             ` Jan Heylen
2018-01-03  9:50               ` Baruch Siach
2018-01-03 10:10                 ` Thomas Petazzoni
2018-01-03 20:37                   ` Samuel Martin
2018-01-03 20:44                     ` Thomas Petazzoni
2017-12-23  7:40     ` Jan Heylen [this message]
2017-12-29 17:23       ` [Buildroot] [PATCH v2 2/2] opentracing-cpp: make shared/static target a configurable option Jan Heylen
2017-12-30 21:47       ` Thomas Petazzoni
2017-12-30 21:44     ` [Buildroot] [PATCH v2 0/2] Opentracing-cpp: new package Thomas Petazzoni

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=1514014802-23736-3-git-send-email-heyleke@gmail.com \
    --to=heyleke@gmail.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.