Skip to contentSkip to conversation

Fix: CMake examples integration

PATCH Applied Jonathan Rajotte Julien 2 participants 3 messages Feb 20, 2017 2 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Hi,

Quoted 2 lines · Michael Jeanson

Fix multiple issues with the CMake examples integration with our build system.

Could you provide more context?

Cheers

Quoted 57 lines
---
 .gitignore               |  1 +
 doc/examples/Makefile.am | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)
.gitignore +1 -0
index 0d322b1..e35e5d5 100644
@@ -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
doc/examples/Makefile.am +6 -6
index 5bc1f4c..239046f 100644
@@ -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)" \
 				.. && \
Signature · 6 lines
Jonathan R. Julien
Efficios
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
#2 lore raw
In reply to a message not in the archive

This fixes: https://bugs.lttng.org/issues/1089

Adding this line to the changelog:

Fixes #1089

merged into master and stable-2.9, thanks!

Mathieu

Quoted 72 lines · ----- On Feb 20, 2017, at 4:48 PM, Michael Jeanson [email protected] wrote:

Fix multiple issues with the CMake examples integration with our build system.

---
.gitignore | 1 +
doc/examples/Makefile.am | 12 ++++++------

2 files changed, 7 insertions(+), 6 deletions(-)
.gitignore +0 -0
index 0d322b1..e35e5d5 100644
@@ -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

doc/examples/Makefile.am +0 -1
index 5bc1f4c..239046f 100644
@@ -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; \

doc/examples/Makefile.am +1 -0
+			(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 \
doc/examples/Makefile.am +0 -1
-			(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; \

doc/examples/Makefile.am +1 -0
+			(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; \
doc/examples/Makefile.am +1 -1
-	fi;
+	fi; \
	if [ x"$(SUBDIRS_CMAKE)" != x"" ]; then \
		for subdir in $(SUBDIRS_CMAKE); do \
			( \
doc/examples/Makefile.am +1 -1
-				cd $(SUBDIRS_CMAKE) && \
+				cd $$subdir && \
				$(MKDIR_P) build && \
				cd build && \
doc/examples/Makefile.am +2 -0
+				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" \
doc/examples/Makefile.am +0 -1
-				-DCMAKE_C_COMPILER="$(CC)" \
				-DCMAKE_C_FLAGS="$(CFLAGS) $(CPPFLAGS)" \
doc/examples/Makefile.am +0 -1
-				-DCMAKE_CXX_COMPILER="$(CXX)" \
				-DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
				-DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
				.. && \

--
2.7.4

Signature · 7 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw
Quoted 7 lines · ----- On Feb 20, 2017, at 4:52 PM, Jonathan Rajotte…

Hi,

Quoted 2 lines · Michael Jeanson

Fix multiple issues with the CMake examples integration with our build system.

Could you provide more context?

https://bugs.lttng.org/issues/1089

Thanks,

Mathieu

Quoted 80 lines

Cheers

Quoted 59 lines
---
 .gitignore               |  1 +
 doc/examples/Makefile.am | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)
.gitignore +1 -0
index 0d322b1..e35e5d5 100644
@@ -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
doc/examples/Makefile.am +0 -1
index 5bc1f4c..239046f 100644
@@ -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; \

doc/examples/Makefile.am +1 -0
+			(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; \

doc/examples/Makefile.am +0 -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; \

doc/examples/Makefile.am +1 -0
+			(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; \

doc/examples/Makefile.am +3 -2
 		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) \

doc/examples/Makefile.am

Quoted 10 lines
doc/examples/Makefile.am +1 -2
+				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
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Signature · 7 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev