doc/examples/Makefile.am: define C and C++ compilers for CMake
authorVicente Olivert Riera <Vincent.Riera@imgtec.com>
Wed, 30 Nov 2016 16:52:51 +0000 (16:52 +0000)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Wed, 30 Nov 2016 20:20:58 +0000 (15:20 -0500)
This prevents build failures when cross-compiling.

If we don't define the compiler, it will use the one from the host
machine. For instance "/usr/bin/c++", which is incorrect.

The failure looks like this:

.............................................................
[ 10%] Building CXX object CMakeFiles/tracepoint-provider.dir/tracepoint-provider.cpp.o
/usr/bin/c++   -Dtracepoint_provider_EXPORTS -I/br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/. -isystem /br/output/build/lttng-libust-2.9.0/include  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC   -o CMakeFiles/tracepoint-provider.dir/tracepoint-provider.cpp.o -c /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.cpp
In file included from /br/output/build/lttng-libust-2.9.0/include/lttng/tracepoint.h:29:0,
                 from /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h:32,
                 from /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.cpp:26:
/br/output/build/lttng-libust-2.9.0/include/lttng/tracepoint-rcu.h:26:27: fatal error: urcu/compiler.h: No such file or directory
 #include <urcu/compiler.h>
                           ^
compilation terminated.
.............................................................

Acked-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
doc/examples/Makefile.am

index 424b8440dff2417aad6f42ac15f9cd26bd03c7bc..5bc1f4c9c2aeb350b3fe5899bcba7626fc7705c3 100644 (file)
@@ -152,7 +152,9 @@ all-local:
                                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)" \
                                .. && \
This page took 0.024694 seconds and 4 git commands to generate.