finalized the merge
Georges Khaznadar
5 years ago
3 | 3 | =================================================================== |
4 | 4 | --- supercollider.orig/CMakeLists.txt |
5 | 5 | +++ supercollider/CMakeLists.txt |
6 | @@ -150,12 +150,13 @@ add_definitions(-DBOOST_CHRONO_HEADER_ON | |
6 | @@ -150,11 +150,11 @@ add_definitions(-DBOOST_CHRONO_HEADER_ON | |
7 | 7 | ############################################# |
8 | 8 | # Detect CCache |
9 | 9 | |
10 | 10 | -find_program(CCacheExectuable ccache) |
11 | 11 | -if( CCacheExectuable ) |
12 | - # only used with >=cmake-3.4 | |
12 | +find_program(CCacheExecutable ccache) | |
13 | +if( CCacheExecutable ) | |
14 | # only used with >=cmake-3.4 | |
13 | 15 | - set( CMAKE_C_COMPILER_LAUNCHER "${CCacheExectuable}" ) |
14 | 16 | - set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExectuable}" ) |
15 | -endif() | |
16 | +## disable ccache for debian package build | |
17 | +## find_program(CCacheExecutable ccache) | |
18 | +## if( CCacheExecutable ) | |
19 | +## # only used with >=cmake-3.4 | |
20 | +## set( CMAKE_C_COMPILER_LAUNCHER "${CCacheExecutable}" ) | |
21 | +## set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExecutable}" ) | |
22 | +## endif() | |
17 | + set( CMAKE_C_COMPILER_LAUNCHER "${CCacheExecutable}" ) | |
18 | + set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExecutable}" ) | |
19 | endif() | |
23 | 20 | |
24 | 21 | ############################################# |
25 | # Options |