diff mbox

[lttng-ust] build: pass configure flags to cmake example

Message ID 1475505765-22557-1-git-send-email-jonathan.rajotte-julien@efficios.com
State Accepted, archived
Headers show

Commit Message

Jonathan Rajotte Oct. 3, 2016, 2:42 p.m. UTC
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
---
 doc/examples/Makefile.am | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Mathieu Desnoyers Oct. 3, 2016, 3:11 p.m. UTC | #1
Merged into master, thanks!

Mathieu

----- On Oct 3, 2016, at 10:42 AM, Jonathan Rajotte jonathan.rajotte-julien at efficios.com wrote:

> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
> ---
> doc/examples/Makefile.am | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
> index c7e5b68..5d67e79 100644
> --- a/doc/examples/Makefile.am
> +++ b/doc/examples/Makefile.am
> @@ -149,7 +149,13 @@ all-local:
> 				cd $(SUBDIRS_CMAKE) && \
> 				$(MKDIR_P) build && \
> 				cd build && \
> -				cmake
> -DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include"
> -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" .. && \
> +				cmake \
> +
> 				-DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include"
> \
> +				-DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \
> +				-DCMAKE_C_FLAGS="$(CFLAGS) $(CPPFLAGS)" \
> +				-DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
> +				-DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
> +				.. && \
> 				$(MAKE) && \
> 				cd .. \
> 			) || exit 1; \
> --
> 2.7.4
diff mbox

Patch

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index c7e5b68..5d67e79 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -149,7 +149,13 @@  all-local:
 				cd $(SUBDIRS_CMAKE) && \
 				$(MKDIR_P) build && \
 				cd build && \
-				cmake -DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" .. && \
+				cmake \
+				-DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \
+				-DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \
+				-DCMAKE_C_FLAGS="$(CFLAGS) $(CPPFLAGS)" \
+				-DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
+				-DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
+				.. && \
 				$(MAKE) && \
 				cd .. \
 			) || exit 1; \