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