All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Rajotte Julien <Jonathan.rajotte-julien@efficios.com>
To: lttng-dev@lists.lttng.org
Subject: Re: [PATCH lttng-ust] Fix: CMake examples integration
Date: Mon, 20 Feb 2017 16:52:18 -0500	[thread overview]
Message-ID: <80d862ed-7d47-5934-aace-61ddb18e31ac__3580.09776468879$1487627562$gmane$org@efficios.com> (raw)
In-Reply-To: <1487627336-15045-1-git-send-email-mjeanson@efficios.com>

Hi,

On 2017-02-20 04:48 PM, Michael Jeanson wrote:
> Fix multiple issues with the CMake examples integration with our build
> system.

Could you provide more context?

Cheers

> 
> Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
> ---
>  .gitignore               |  1 +
>  doc/examples/Makefile.am | 12 ++++++------
>  2 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/.gitignore b/.gitignore
> index 0d322b1..e35e5d5 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -41,6 +41,7 @@ doc/examples/gen-tp/sample
>  doc/examples/gen-tp/sample_tracepoint.h
>  doc/examples/demo-tracef/demo-tracef
>  doc/examples/demo-tracelog/demo-tracelog
> +doc/examples/cmake-multiple-shared-libraries/build/
>  
>  doc/man/*.xml
>  doc/man/lttng-gen-tp.1
> diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
> index 5bc1f4c..239046f 100644
> --- a/doc/examples/Makefile.am
> +++ b/doc/examples/Makefile.am
> @@ -135,26 +135,26 @@ all-local:
>  	done; \
>  	if [ x"$(SUBDIRS_JUL)" != x"" ]; then \
>  		for subdir in $(SUBDIRS_JUL); do \
> -			(cd $(SUBDIRS_JUL) && $(MAKE) JAVA_CLASSPATH_OVERRIDE_JUL="../../../liblttng-ust-java-agent/java/lttng-ust-agent-jul" JAVA_CLASSPATH_OVERRIDE_COMMON="../../../liblttng-ust-java-agent/java/lttng-ust-agent-common" $(AM_MAKEFLAGS) all && cd ..) || exit 1; \
> +			(cd $$subdir && $(MAKE) JAVA_CLASSPATH_OVERRIDE_JUL="../../../liblttng-ust-java-agent/java/lttng-ust-agent-jul" JAVA_CLASSPATH_OVERRIDE_COMMON="../../../liblttng-ust-java-agent/java/lttng-ust-agent-common" $(AM_MAKEFLAGS) all && cd ..) || exit 1; \
>  		done; \
>  	fi; \
>  	if [ x"$(SUBDIRS_LOG4J)" != x"" ]; then \
>  		for subdir in $(SUBDIRS_LOG4J); do \
> -			(cd $(SUBDIRS_LOG4J) && $(MAKE) JAVA_CLASSPATH_OVERRIDE_LOG4J="../../../liblttng-ust-java-agent/java/lttng-ust-agent-log4j" JAVA_CLASSPATH_OVERRIDE_COMMON="../../../liblttng-ust-java-agent/java/lttng-ust-agent-common" $(AM_MAKEFLAGS) all && cd ..) || exit 1; \
> +			(cd $$subdir && $(MAKE) JAVA_CLASSPATH_OVERRIDE_LOG4J="../../../liblttng-ust-java-agent/java/lttng-ust-agent-log4j" JAVA_CLASSPATH_OVERRIDE_COMMON="../../../liblttng-ust-java-agent/java/lttng-ust-agent-common" $(AM_MAKEFLAGS) all && cd ..) || exit 1; \
>  		done; \
> -	fi;
> +	fi; \
>  	if [ x"$(SUBDIRS_CMAKE)" != x"" ]; then \
>  		for subdir in $(SUBDIRS_CMAKE); do \
>  			( \
> -				cd $(SUBDIRS_CMAKE) && \
> +				cd $$subdir && \
>  				$(MKDIR_P) build && \
>  				cd build && \
> +				CC=$(CC) \
> +				CXX=$(CXX) \
>  				cmake \
>  				-DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \
>  				-DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \
> -				-DCMAKE_C_COMPILER="$(CC)" \
>  				-DCMAKE_C_FLAGS="$(CFLAGS) $(CPPFLAGS)" \
> -				-DCMAKE_CXX_COMPILER="$(CXX)" \
>  				-DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
>  				-DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
>  				.. && \
> 

-- 
Jonathan R. Julien
Efficios
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

       reply	other threads:[~2017-02-20 21:52 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1487627336-15045-1-git-send-email-mjeanson@efficios.com>
2017-02-20 21:52 ` Jonathan Rajotte Julien [this message]
2017-02-20 22:02 ` [PATCH lttng-ust] Fix: CMake examples integration Mathieu Desnoyers
     [not found] ` <80d862ed-7d47-5934-aace-61ddb18e31ac@efficios.com>
2017-02-20 22:03   ` Mathieu Desnoyers
2017-02-20 21:48 Michael Jeanson

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='80d862ed-7d47-5934-aace-61ddb18e31ac__3580.09776468879$1487627562$gmane$org@efficios.com' \
    --to=jonathan.rajotte-julien@efficios.com \
    --cc=lttng-dev@lists.lttng.org \
    /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.