[Bf-blender-cvs] [c56133c8468] master: Fix T64480: Tweak needed to Audaspace CMake options
Jörg Müller
noreply at git.blender.org
Wed May 22 12:16:49 CEST 2019
Commit: c56133c84686048d278009d22e0a53ffd6b35be7
Author: Jörg Müller
Date: Wed May 22 12:14:51 2019 +0200
Branches: master
https://developer.blender.org/rBc56133c84686048d278009d22e0a53ffd6b35be7
Fix T64480: Tweak needed to Audaspace CMake options
The issue was that Audaspace options ended up in the cmake cache though
they should not be there.
Also reverting indentation change by @ideasman42.
Thanks to @mont29 for reporting and helping with the fix.
===================================================================
M extern/audaspace/CMakeLists.txt
M extern/audaspace/blender_config.cmake
===================================================================
diff --git a/extern/audaspace/CMakeLists.txt b/extern/audaspace/CMakeLists.txt
index 9e7592fd5f4..84f5e8441c1 100644
--- a/extern/audaspace/CMakeLists.txt
+++ b/extern/audaspace/CMakeLists.txt
@@ -18,7 +18,7 @@ cmake_minimum_required(VERSION 3.0)
include(CMakeDependentOption)
if(POLICY CMP0054)
- cmake_policy(SET CMP0054 NEW)
+ cmake_policy(SET CMP0054 NEW)
endif()
project(audaspace)
@@ -27,223 +27,223 @@ set(AUDASPACE_VERSION 1.3)
set(AUDASPACE_LONG_VERSION ${AUDASPACE_VERSION}.0)
if(DEFINED AUDASPACE_CMAKE_CFG)
- include(${AUDASPACE_CMAKE_CFG})
+ include(${AUDASPACE_CMAKE_CFG})
endif()
if(NOT DEFINED AUDASPACE_STANDALONE)
- set(AUDASPACE_STANDALONE TRUE)
+ set(AUDASPACE_STANDALONE TRUE)
endif()
# sources
set(SRC
- src/devices/DefaultSynchronizer.cpp
- src/devices/DeviceManager.cpp
- src/devices/NULLDevice.cpp
- src/devices/ReadDevice.cpp
- src/devices/SoftwareDevice.cpp
- src/Exception.cpp
- src/file/File.cpp
- src/file/FileManager.cpp
- src/file/FileWriter.cpp
- src/fx/Accumulator.cpp
- src/fx/ADSR.cpp
- src/fx/ADSRReader.cpp
- src/fx/BaseIIRFilterReader.cpp
- src/fx/ButterworthCalculator.cpp
- src/fx/Butterworth.cpp
- src/fx/CallbackIIRFilterReader.cpp
- src/fx/Delay.cpp
- src/fx/DelayReader.cpp
- src/fx/DynamicIIRFilter.cpp
- src/fx/DynamicIIRFilterReader.cpp
- src/fx/DynamicMusic.cpp
- src/fx/Effect.cpp
- src/fx/EffectReader.cpp
- src/fx/Envelope.cpp
- src/fx/Fader.cpp
- src/fx/FaderReader.cpp
- src/fx/HighpassCalculator.cpp
- src/fx/Highpass.cpp
- src/fx/IIRFilter.cpp
- src/fx/IIRFilterReader.cpp
- src/fx/Limiter.cpp
- src/fx/LimiterReader.cpp
- src/fx/Loop.cpp
- src/fx/LoopReader.cpp
- src/fx/LowpassCalculator.cpp
- src/fx/Lowpass.cpp
- src/fx/Modulator.cpp
- src/fx/ModulatorReader.cpp
- src/fx/MutableReader.cpp
- src/fx/MutableSound.cpp
- src/fx/Pitch.cpp
- src/fx/PitchReader.cpp
- src/fx/PlaybackManager.cpp
- src/fx/PlaybackCategory.cpp
- src/fx/Reverse.cpp
- src/fx/ReverseReader.cpp
- src/fx/SoundList.cpp
- src/fx/Source.cpp
- src/fx/Sum.cpp
- src/fx/Threshold.cpp
- src/fx/Volume.cpp
- src/fx/VolumeReader.cpp
- src/fx/VolumeSound.cpp
- src/fx/VolumeStorage.cpp
- src/generator/Sawtooth.cpp
- src/generator/SawtoothReader.cpp
- src/generator/Silence.cpp
- src/generator/SilenceReader.cpp
- src/generator/Sine.cpp
- src/generator/SineReader.cpp
- src/generator/Square.cpp
- src/generator/SquareReader.cpp
- src/generator/Triangle.cpp
- src/generator/TriangleReader.cpp
- src/respec/ChannelMapper.cpp
- src/respec/ChannelMapperReader.cpp
- src/respec/Converter.cpp
- src/respec/ConverterFunctions.cpp
- src/respec/ConverterReader.cpp
- src/respec/JOSResample.cpp
- src/respec/JOSResampleReaderCoeff.cpp
- src/respec/JOSResampleReader.cpp
- src/respec/LinearResample.cpp
- src/respec/LinearResampleReader.cpp
- src/respec/Mixer.cpp
- src/respec/ResampleReader.cpp
- src/respec/SpecsChanger.cpp
- src/sequence/AnimateableProperty.cpp
- src/sequence/Double.cpp
- src/sequence/DoubleReader.cpp
- src/sequence/PingPong.cpp
- src/sequence/Sequence.cpp
- src/sequence/SequenceData.cpp
- src/sequence/SequenceEntry.cpp
- src/sequence/SequenceHandle.cpp
- src/sequence/SequenceReader.cpp
- src/sequence/Superpose.cpp
- src/sequence/SuperposeReader.cpp
- src/util/Barrier.cpp
- src/util/Buffer.cpp
- src/util/BufferReader.cpp
- src/util/StreamBuffer.cpp
- src/util/ThreadPool.cpp
+ src/devices/DefaultSynchronizer.cpp
+ src/devices/DeviceManager.cpp
+ src/devices/NULLDevice.cpp
+ src/devices/ReadDevice.cpp
+ src/devices/SoftwareDevice.cpp
+ src/Exception.cpp
+ src/file/File.cpp
+ src/file/FileManager.cpp
+ src/file/FileWriter.cpp
+ src/fx/Accumulator.cpp
+ src/fx/ADSR.cpp
+ src/fx/ADSRReader.cpp
+ src/fx/BaseIIRFilterReader.cpp
+ src/fx/ButterworthCalculator.cpp
+ src/fx/Butterworth.cpp
+ src/fx/CallbackIIRFilterReader.cpp
+ src/fx/Delay.cpp
+ src/fx/DelayReader.cpp
+ src/fx/DynamicIIRFilter.cpp
+ src/fx/DynamicIIRFilterReader.cpp
+ src/fx/DynamicMusic.cpp
+ src/fx/Effect.cpp
+ src/fx/EffectReader.cpp
+ src/fx/Envelope.cpp
+ src/fx/Fader.cpp
+ src/fx/FaderReader.cpp
+ src/fx/HighpassCalculator.cpp
+ src/fx/Highpass.cpp
+ src/fx/IIRFilter.cpp
+ src/fx/IIRFilterReader.cpp
+ src/fx/Limiter.cpp
+ src/fx/LimiterReader.cpp
+ src/fx/Loop.cpp
+ src/fx/LoopReader.cpp
+ src/fx/LowpassCalculator.cpp
+ src/fx/Lowpass.cpp
+ src/fx/Modulator.cpp
+ src/fx/ModulatorReader.cpp
+ src/fx/MutableReader.cpp
+ src/fx/MutableSound.cpp
+ src/fx/Pitch.cpp
+ src/fx/PitchReader.cpp
+ src/fx/PlaybackManager.cpp
+ src/fx/PlaybackCategory.cpp
+ src/fx/Reverse.cpp
+ src/fx/ReverseReader.cpp
+ src/fx/SoundList.cpp
+ src/fx/Source.cpp
+ src/fx/Sum.cpp
+ src/fx/Threshold.cpp
+ src/fx/Volume.cpp
+ src/fx/VolumeReader.cpp
+ src/fx/VolumeSound.cpp
+ src/fx/VolumeStorage.cpp
+ src/generator/Sawtooth.cpp
+ src/generator/SawtoothReader.cpp
+ src/generator/Silence.cpp
+ src/generator/SilenceReader.cpp
+ src/generator/Sine.cpp
+ src/generator/SineReader.cpp
+ src/generator/Square.cpp
+ src/generator/SquareReader.cpp
+ src/generator/Triangle.cpp
+ src/generator/TriangleReader.cpp
+ src/respec/ChannelMapper.cpp
+ src/respec/ChannelMapperReader.cpp
+ src/respec/Converter.cpp
+ src/respec/ConverterFunctions.cpp
+ src/respec/ConverterReader.cpp
+ src/respec/JOSResample.cpp
+ src/respec/JOSResampleReaderCoeff.cpp
+ src/respec/JOSResampleReader.cpp
+ src/respec/LinearResample.cpp
+ src/respec/LinearResampleReader.cpp
+ src/respec/Mixer.cpp
+ src/respec/ResampleReader.cpp
+ src/respec/SpecsChanger.cpp
+ src/sequence/AnimateableProperty.cpp
+ src/sequence/Double.cpp
+ src/sequence/DoubleReader.cpp
+ src/sequence/PingPong.cpp
+ src/sequence/Sequence.cpp
+ src/sequence/SequenceData.cpp
+ src/sequence/SequenceEntry.cpp
+ src/sequence/SequenceHandle.cpp
+ src/sequence/SequenceReader.cpp
+ src/sequence/Superpose.cpp
+ src/sequence/SuperposeReader.cpp
+ src/util/Barrier.cpp
+ src/util/Buffer.cpp
+ src/util/BufferReader.cpp
+ src/util/StreamBuffer.cpp
+ src/util/ThreadPool.cpp
)
set(PRIVATE_HDR
- src/sequence/SequenceHandle.h
+ src/sequence/SequenceHandle.h
)
set(PUBLIC_HDR
- include/devices/DefaultSynchronizer.h
- include/devices/DeviceManager.h
- include/devices/I3DDevice.h
- include/devices/I3DHandle.h
- include/devices/IDeviceFactory.h
- include/devices/IDevice.h
- include/devices/IHandle.h
- include/devices/ISynchronizer.h
- include/devices/NULLDevice.h
- include/devices/ReadDevice.h
- include/devices/SoftwareDevice.h
- include/Exception.h
- include/file/File.h
- include/file/FileManager.h
- include/file/FileWriter.h
- include/file/IFileInput.h
- include/file/IFileOutput.h
- include/file/IWriter.h
- include/fx/Accumulator.h
- include/fx/ADSR.h
- include/fx/ADSRReader.h
- include/fx/BaseIIRFilterReader.h
- include/fx/ButterworthCalculator.h
- include/fx/Butterworth.h
- include/fx/CallbackIIRFilterReader.h
- include/fx/Delay.h
- include/fx/DelayReader.h
- include/fx/DynamicIIRFilter.h
- include/fx/DynamicIIRFilterReader.h
- include/fx/DynamicMusic.h
- include/fx/Effect.h
- include/fx/EffectReader.h
- include/fx/Envelope.h
- include/fx/Fader.h
- include/fx/FaderReader.h
- include/fx/HighpassCalculator.h
- include/fx/Highpass.h
- include/fx/IDynamicIIRFilterCalculator.h
- include/fx/IIRFilter.h
- include/fx/IIRFilterReader.h
- include/fx/Limiter.h
- include/fx/LimiterReader.h
- include/fx/Loop.h
- include/fx/LoopReader.h
- include/fx/LowpassCalculator.h
- include/fx/Lowpass.h
- include/fx/Modulator.h
- include/fx/ModulatorReader.h
- include/fx/MutableReader.h
- include/fx/MutableSound.h
- include/fx/Pitch.h
- include/fx/PitchReader.h
- include/fx/PlaybackManager.h
- include/fx/PlaybackCategory.h
- include/fx/Reverse.h
- include/fx/ReverseReader.h
- include/fx/SoundList.h
- include/fx/Source.h
- include/fx/Sum.h
- include/fx/Threshold.h
- include/fx/Volume.h
- include/fx/VolumeReader.h
- include/fx/VolumeSound.h
- include/fx/VolumeStorage.h
- include/generator/Sawtooth.h
- include/generator/SawtoothReader.h
- include/generator/Silence.h
- include/generator/SilenceReader.h
- include/generator/Sine.h
- include/generator/SineReader.h
- include/generator/Square.h
- include/generator/SquareReader.h
- include/generator/Triangle.h
- include/generator/TriangleReader.h
- include/IReader.h
- include/ISound.h
- include/plugin/PluginManager.h
- include/respec/ChannelMapper.h
- include/respec/ChannelMapperReader.h
- include/respec/ConverterFunctions.h
- include/respec/Converter.h
- include/respec/ConverterReader.h
- include/respec/JOSResample.h
- include/respec/JOSResampleReader.h
- include/respec/LinearResample.h
- include/respec/LinearResampleReader.h
- include/respec/Mixer.h
- include/respec/ResampleReader.h
- include/respec/Specification.h
- include/respec/SpecsChanger.h
- include/sequence/AnimateableProperty.h
- include/sequence/Double.h
- include/sequence/DoubleReader.h
- include/sequence/PingPong.h
- include/sequence/SequenceData.h
- include/sequence/SequenceEntry.h
- include/sequence/Sequence.h
- include/sequence/SequenceReader.h
- include/sequence/Superpose.h
- include/sequence/SuperposeReader.h
- include/util/Barrier.h
- include/util/Buffer.h
- include/util/BufferReader.h
- include/util/ILockable.h
- include/util/Math3D.h
- include/util/StreamBuffer.h
- include/util/ThreadPool.h
+ include/devices/DefaultSynchronizer.h
+ include/devices/DeviceManager.h
+ include/devices/I3DDevice.h
+ include/devices/I3DHandle.h
+ include/devices/IDeviceFactory.h
+ include/devices/IDevice.h
+ include/devices/IHandle.h
+ include/devices/ISynchronizer.h
+ include/devices/NULLDevice.h
+ include/devices/ReadDevice.h
+ include/devices/SoftwareDevice.h
+ include/Exception.h
+ include/file/File.h
+ include/file/FileManager.h
+ include/file/FileWriter.h
+ include/file/IFileInput.h
+ include/file/IFileOutput.h
+ include/file/IWriter.h
+ include/fx/Accumulator.h
+ include/fx/ADSR.h
+ include/fx/ADSRReader.h
+ include/fx/BaseIIRFilterReader.h
+ include/fx/ButterworthCalculator.h
+ include/fx/Butterworth.h
+ include/fx/CallbackIIRFilterReader.h
+ include/fx/Delay.h
+ include/fx/DelayReader.h
+ include/fx/DynamicIIRFilter.h
+ includ
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list