1
=== modified file 'src/client/lttng/CMakeLists.txt'
2
--- src/client/lttng/CMakeLists.txt	2016-03-29 07:30:50 +0000
3
+++ src/client/lttng/CMakeLists.txt	2016-05-23 13:07:06 +0000
4
@@ -15,6 +15,15 @@
5
15
string(REPLACE "-flto" "" NO_LTO_FLAGS ${CMAKE_C_FLAGS})
15
string(REPLACE "-flto" "" NO_LTO_FLAGS ${CMAKE_C_FLAGS})
6
16
set(CMAKE_C_FLAGS ${NO_LTO_FLAGS})
16
set(CMAKE_C_FLAGS ${NO_LTO_FLAGS})
7
17
17
8
18
# lttng-ust uses urcu headers which contain code blocks inside expressions 
9
19
# this is a gnu extension.
10
20
string(REPLACE "-pedantic" "" NO_PEDANTIC_CHECK_FLAGS ${CMAKE_CXX_FLAGS})
11
21
if("${CMAKE_CXX_COMPILER}" MATCHES "clang")
12
22
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-statement-expression")
13
23
else()
14
24
    set(CMAKE_CXX_FLAGS "${NO_PEDANTIC_CHECK_FLAGS}")
15
25
endif()
16
26
17
18
add_library(mirclientlttng SHARED tracepoints.c)
27
add_library(mirclientlttng SHARED tracepoints.c)
18
19
28
19
20
# Don't treat missing-field-initializers as an error, since
29
# Don't treat missing-field-initializers as an error, since
20
21
30
21
=== modified file 'src/server/report/lttng/CMakeLists.txt'
22
--- src/server/report/lttng/CMakeLists.txt	2016-03-29 07:30:50 +0000
23
+++ src/server/report/lttng/CMakeLists.txt	2016-05-23 13:07:06 +0000
24
@@ -14,6 +14,15 @@
25
14
string(REPLACE "-flto" "" NO_LTO_FLAGS ${CMAKE_C_FLAGS})
14
string(REPLACE "-flto" "" NO_LTO_FLAGS ${CMAKE_C_FLAGS})
26
15
set(CMAKE_C_FLAGS ${NO_LTO_FLAGS})
15
set(CMAKE_C_FLAGS ${NO_LTO_FLAGS})
27
16
16
28
17
# lttng-ust uses urcu headers which contain code blocks inside expressions 
29
18
# this is a gnu extension.
30
19
string(REPLACE "-pedantic" "" NO_PEDANTIC_CHECK_FLAGS ${CMAKE_CXX_FLAGS})
31
20
if("${CMAKE_CXX_COMPILER}" MATCHES "clang")
32
21
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-statement-expression")
33
22
else()
34
23
    set(CMAKE_CXX_FLAGS "${NO_PEDANTIC_CHECK_FLAGS}")
35
24
endif()
36
25
37
17
set(
26
set(
38
18
  LTTNG_SOURCES
27
  LTTNG_SOURCES
39
19
28
Reviewer	Review Type	Date Requested	Status
Chris Halse Rogers		2016-05-23	Approve on 2016-05-24
Mir CI Bot	continuous-integration		Approve on 2016-05-23
Review via email: mp+295418@code.launchpad.net
1	=== modified file 'src/client/lttng/CMakeLists.txt'
2	--- src/client/lttng/CMakeLists.txt 2016-03-29 07:30:50 +0000
3	+++ src/client/lttng/CMakeLists.txt 2016-05-23 13:07:06 +0000
4	@@ -15,6 +15,15 @@
5	15	string(REPLACE "-flto" "" NO_LTO_FLAGS ${CMAKE_C_FLAGS})	15	string(REPLACE "-flto" "" NO_LTO_FLAGS ${CMAKE_C_FLAGS})
6	16	set(CMAKE_C_FLAGS ${NO_LTO_FLAGS})	16	set(CMAKE_C_FLAGS ${NO_LTO_FLAGS})
7	17		17
8			18	# lttng-ust uses urcu headers which contain code blocks inside expressions
9			19	# this is a gnu extension.
10			20	string(REPLACE "-pedantic" "" NO_PEDANTIC_CHECK_FLAGS ${CMAKE_CXX_FLAGS})
11			21	if("${CMAKE_CXX_COMPILER}" MATCHES "clang")
12			22	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-statement-expression")
13			23	else()
14			24	set(CMAKE_CXX_FLAGS "${NO_PEDANTIC_CHECK_FLAGS}")
15			25	endif()
16			26
17	18	add_library(mirclientlttng SHARED tracepoints.c)	27	add_library(mirclientlttng SHARED tracepoints.c)
18	19		28
19	20	# Don't treat missing-field-initializers as an error, since	29	# Don't treat missing-field-initializers as an error, since
20	21		30
21	=== modified file 'src/server/report/lttng/CMakeLists.txt'
22	--- src/server/report/lttng/CMakeLists.txt 2016-03-29 07:30:50 +0000
23	+++ src/server/report/lttng/CMakeLists.txt 2016-05-23 13:07:06 +0000
24	@@ -14,6 +14,15 @@
25	14	string(REPLACE "-flto" "" NO_LTO_FLAGS ${CMAKE_C_FLAGS})	14	string(REPLACE "-flto" "" NO_LTO_FLAGS ${CMAKE_C_FLAGS})
26	15	set(CMAKE_C_FLAGS ${NO_LTO_FLAGS})	15	set(CMAKE_C_FLAGS ${NO_LTO_FLAGS})
27	16		16
28			17	# lttng-ust uses urcu headers which contain code blocks inside expressions
29			18	# this is a gnu extension.
30			19	string(REPLACE "-pedantic" "" NO_PEDANTIC_CHECK_FLAGS ${CMAKE_CXX_FLAGS})
31			20	if("${CMAKE_CXX_COMPILER}" MATCHES "clang")
32			21	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-statement-expression")
33			22	else()
34			23	set(CMAKE_CXX_FLAGS "${NO_PEDANTIC_CHECK_FLAGS}")
35			24	endif()
36			25
37	17	set(	26	set(
38	18	LTTNG_SOURCES	27	LTTNG_SOURCES
39	19		28