From: Debian Multimedia Maintainers Date: Wed, 16 Dec 2020 21:28:58 +0000 (+0100) Subject: disable-ccache X-Git-Tag: archive/raspbian/1%3.13.0+repack-1+rpi1^2~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1b7a32e34d1b376fef8ce5274b8c5b0bec5e6aaf;p=supercollider.git disable-ccache disabled the use of ccache, to prevent FTBFS; as the compilation is done once it has no backdraws to make the debian package. Gbp-Pq: Name disable-ccache.patch --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 699311c..c2b619a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,31 +46,6 @@ CONFIGURE_FILE( "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) -# workaround for using ccache with Xcode generator -# thanks to Craig Scott: https://crascit.com/2016/04/09/using-ccache-with-cmake/ -get_property(RULE_LAUNCH_COMPILE GLOBAL PROPERTY RULE_LAUNCH_COMPILE) -if(RULE_LAUNCH_COMPILE AND CMAKE_GENERATOR STREQUAL "Xcode") - - # find ccache - find_program(CCACHE_PROGRAM ccache) - - message(STATUS "Xcode and ccache detected: using ccache to speed up build process") - - # Set up wrapper scripts - set(SC_LAUNCH_C_SCRIPT "${CMAKE_BINARY_DIR}/launch-c") - set(SC_LAUNCH_CXX_SCRIPT "${CMAKE_BINARY_DIR}/launch-cxx") - - configure_file("cmake_modules/launch-c.in" launch-c) - configure_file("cmake_modules/launch-cxx.in" launch-cxx) - execute_process(COMMAND chmod a+rx "${SC_LAUNCH_C_SCRIPT}" "${SC_LAUNCH_CXX_SCRIPT}") - - # Set Xcode project attributes to route compilation and linking - # through our scripts - set(CMAKE_XCODE_ATTRIBUTE_CC "${SC_LAUNCH_C_SCRIPT}") - set(CMAKE_XCODE_ATTRIBUTE_CXX "${SC_LAUNCH_CXX_SCRIPT}") - set(CMAKE_XCODE_ATTRIBUTE_LD "${SC_LAUNCH_C_SCRIPT}") - set(CMAKE_XCODE_ATTRIBUTE_LDPLUSPLUS "${SC_LAUNCH_CXX_SCRIPT}") -endif() ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") @@ -148,38 +123,6 @@ endif() add_definitions(-DBOOST_CHRONO_HEADER_ONLY -DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE) -############################################# -# Detect CCache - -find_program(CCacheExectuable ccache) -if( CCacheExectuable ) - # only used with >=cmake-3.4 - set( CMAKE_C_COMPILER_LAUNCHER "${CCacheExectuable}" ) - set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExectuable}" ) - if(NOT CMAKE_GENERATOR MATCHES "Xcode" AND (NOT CMAKE_GENERATOR MATCHES "Visual Studio")) # we already post a message when using Xcode or MSVC - message(STATUS "Found ccache at ${CCacheExectuable}: using ccache to speed up build process") - endif() - - # fix for Visual Studio adapted from https://github.com/ccache/ccache/wiki/MS-Visual-Studio#usage - # NOTE: there is an issue with ccache installed from chocolatey - # since chocolatey puts a "shim" as opposed to the actual executable in the PATH - # the solution is to add the path to the actual ccache executable earlier in the path - # e.g. in bash: export PATH=`echo c:/ProgramData/chocolatey/lib/ccache/tools/ccache*`:$PATH - if (MSVC) - message(STATUS "Found ccache at ${CCacheExectuable}: using ccache with MSVC to speed up build process") - file(COPY_FILE - ${CCacheExectuable} ${CMAKE_BINARY_DIR}/cl.exe - ONLY_IF_DIFFERENT) - - set(CMAKE_VS_GLOBALS - "CLToolExe=cl.exe" - "CLToolPath=${CMAKE_BINARY_DIR}" - "TrackFileAccess=false" - "UseMultiToolTask=true" - "DebugInformationFormat=OldStyle" - ) - endif() -endif() ############################################# # Options