From 17a4a34896806bf38231aaddbad85fb595d755fc Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Wed, 27 Mar 2024 10:54:36 -0400 Subject: [PATCH] Remove Experimental.cmake --- CMakeLists.txt | 3 --- src/CMakeLists.txt | 2 -- src/Experimental.cmake | 35 ----------------------------------- 3 files changed, 40 deletions(-) delete mode 100644 src/Experimental.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index a04ee1016d2c..ee637c3e7b04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -578,9 +578,6 @@ set( AUDACITY_INFO_VERSION ${AUDACITY_VERSION}.${AUDACITY_RELEASE}.${AUDACITY_RE include( AudacityDependencies ) include( AudacityTesting ) -# define EXPERIMENTAL flags -# Do this before consistency checks for added third-party libraries -include( "src/Experimental.cmake" ) cmd_option( ${_OPT}use_ffmpeg "Use ffmpeg library [loaded, off]" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1024795c9d62..6174758ee5a4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -926,8 +926,6 @@ list( APPEND SOURCES update/NoUpdatesAvailableDialog.h update/NoUpdatesAvailableDialog.cpp > - - Experimental.cmake ) # diff --git a/src/Experimental.cmake b/src/Experimental.cmake deleted file mode 100644 index 6d3619393f67..000000000000 --- a/src/Experimental.cmake +++ /dev/null @@ -1,35 +0,0 @@ -#[[ - - Audacity: A Digital Audio Editor - - Experimental.cmake - - Dominic Mazzoni - James Crook - - Used at configuration time to generate compiler options that enable or disable - experimental features. - - When the features become mainstream the options will then be retired. - - JKC: This file solves a problem of how to avoid forking the - code base when working on new features e.g: - - Additional displays in Audacity - - Modular architecture. - Add options in here for the new features, and make your code - conditional on them with #ifdef. - - For each name in the list, EXPERIMENTAL_{name} is the token to test with - #ifdef. - - All the options are positive, i.e., when not commented out, - they enable the feature. - -]] - -set( EXPERIMENTAL_OPTIONS_LIST -) - -# Now define the flags -list( TRANSFORM EXPERIMENTAL_OPTIONS_LIST PREPEND "EXPERIMENTAL_" ) -add_compile_definitions( ${EXPERIMENTAL_OPTIONS_LIST} )