diff options
Diffstat (limited to 'testing/sems/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch')
| -rw-r--r-- | testing/sems/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/testing/sems/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch b/testing/sems/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch index 0cfeab8c83a..4e702ad149a 100644 --- a/testing/sems/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch +++ b/testing/sems/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch @@ -1,19 +1,8 @@ -From 26929b6a7a62299b71bf7c99f17f75670a2040e2 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov <lemenkov@gmail.com> -Date: Wed, 31 Mar 2010 11:53:48 +0400 -Subject: [PATCH 02/11] Allow rewrite of custom makefiles by CMake - -Signed-off-by: Peter Lemenkov <lemenkov@gmail.com> ---- - CMakeLists.txt | 9 --------- - 1 files changed, 0 insertions(+), 9 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a6ff425..ef3934e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,15 +26,6 @@ ELSE(IS_DEVEL) - ENDIF(IS_DEVEL) +diff -urp a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2021-10-21 10:06:12.000000000 +0200 ++++ b/CMakeLists.txt 2021-12-02 00:42:09.962054752 +0100 +@@ -34,14 +34,14 @@ ADD_DEFINITIONS(-DSEMS_APP_NAME=\\\"sems + MESSAGE(STATUS "Configuring ${CMAKE_PROJECT_NAME} v. ${SEMS_VERSION}") -IF(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE) @@ -24,10 +13,14 @@ index a6ff425..ef3934e 100644 -This process created the file `CMakeCache.txt' and the directory `CMakeFiles'. -Please delete them.") -ENDIF(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE) -- ++#IF(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE) ++# message(FATAL_ERROR "In-source builds are not allowed. ++#CMake would overwrite all makefiles distributed with SEMS. ++#Please create a directory and run cmake from there, passing the path ++#to this source directory as the last argument. ++#This process created the file `CMakeCache.txt' and the directory `CMakeFiles'. ++#Please delete them.") ++#ENDIF(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE) + + OPTION(SEMS_USE_OPUS "Build with Opus" OFF) OPTION(SEMS_USE_SPANDSP "Build with spandsp" OFF) - OPTION(SEMS_USE_LIBSAMPLERATE "Build with libsamplerate" OFF) - OPTION(SEMS_USE_ZRTP "Build with ZRTP" OFF) --- -1.7.3.4 - |