blob: 179d04a55969e230d6225fc3f768273092fab847 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
Upstream-Status: Backport
http://www.streamboard.tv/oscam/changeset/10068
http://www.streamboard.tv/oscam/changeset/10070
Index: /CMakeLists.txt
===================================================================
--- a/CMakeLists.txt (revision 10067)
+++ b/CMakeLists.txt (revision 10068)
@@ -625,8 +625,8 @@
list(GET GCC_VERSION_COMPONENTS 0 GCC_MINOR)
add_definitions ("-W -Wall ")
- set (CMAKE_C_FLAGS "-Wall -O2")
- set (CMAKE_CXX_FLAGS "-Wall -O2")
- set (CMAKE_C_FLAGS_DEBUG "-O0 -ggdb")
- set (CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb")
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O2")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2")
+ set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb")
+ set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb")
endif (CMAKE_COMPILER_IS_GNUCC)
# some optimisations
Index: /csctapi/CMakeLists.txt
===================================================================
--- a/csctapi/CMakeLists.txt (revision 10069)
+++ b/csctapi/CMakeLists.txt (revision 10070)
@@ -6,8 +6,8 @@
list(GET GCC_VERSION_COMPONENTS 0 GCC_MINOR)
add_definitions ("-W -Wall ")
- set (CMAKE_C_FLAGS "-Wall -O2")
- set (CMAKE_CXX_FLAGS "-Wall -O2")
- set (CMAKE_C_FLAGS_DEBUG "-O0 -ggdb")
- set (CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb")
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O2")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2")
+ set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb")
+ set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb")
endif (CMAKE_COMPILER_IS_GNUCC)
# Mac extra removes to avoid ranlib warnings in some situations
|
