From e1a68619874bbef7b5ac0593d586d17ce129637f Mon Sep 17 00:00:00 2001 From: Joerg Mueller Date: Fri, 3 Aug 2018 10:58:42 +0200 Subject: Bugfix: audaspace cmake variables need to be cached. --- extern/audaspace/blender_config.cmake | 37 ++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'extern/audaspace/blender_config.cmake') diff --git a/extern/audaspace/blender_config.cmake b/extern/audaspace/blender_config.cmake index fb1ef95fee4..7deb78d27da 100644 --- a/extern/audaspace/blender_config.cmake +++ b/extern/audaspace/blender_config.cmake @@ -1,21 +1,20 @@ set(AUDASPACE_STANDALONE FALSE) -set(BUILD_DEMOS FALSE) -set(SHARED_LIBRARY FALSE) -set(WITH_C TRUE) -set(WITH_DOCS FALSE) -set(WITH_FFMPEG ${WITH_CODEC_FFMPEG}) -set(WITH_FFTW FALSE) -set(WITH_LIBSNDFILE ${WITH_CODEC_SNDFILE}) -set(SEPARATE_C FALSE) -set(PLUGIN_FFMPEG FALSE) -set(PLUGIN_JACK FALSE) -set(PLUGIN_LIBSNDFILE FALSE) -set(PLUGIN_OPENAL FALSE) -set(PLUGIN_SDL FALSE) -set(WITH_PYTHON_MODULE FALSE) -set(DYNLOAD_JACK ${WITH_JACK_DYNLOAD}) -set(WITH_BINDING_DOCS FALSE) -set(BLENDER_AUDASPACE TRUE) +set(BUILD_DEMOS FALSE CACHE BOOL "Build and install demos") +set(SHARED_LIBRARY FALSE CACHE BOOL "Build Shared Library") +set(WITH_C TRUE CACHE BOOL "Build C Module") +set(WITH_DOCS FALSE CACHE BOOL "Build C++ HTML Documentation with Doxygen") +set(WITH_FFMPEG ${WITH_CODEC_FFMPEG} CACHE BOOL "Build With FFMPEG") +set(WITH_FFTW FALSE CACHE BOOL "Build With FFTW") +set(WITH_LIBSNDFILE ${WITH_CODEC_SNDFILE} CACHE BOOL "Build With LibSndFile") +set(SEPARATE_C FALSE CACHE BOOL "Build C Binding as separate library") +set(PLUGIN_FFMPEG FALSE CACHE BOOL "Build FFMPEG Plugin") +set(PLUGIN_JACK FALSE CACHE BOOL "Build JACK Plugin") +set(PLUGIN_LIBSNDFILE FALSE CACHE BOOL "Build LibSndFile Plugin") +set(PLUGIN_OPENAL FALSE CACHE BOOL "Build OpenAL Plugin") +set(PLUGIN_SDL FALSE CACHE BOOL "Build SDL Plugin") +set(WITH_PYTHON_MODULE FALSE CACHE BOOL "Build Python Module") +set(DYNLOAD_JACK ${WITH_JACK_DYNLOAD} CACHE BOOL "Dynamically load JACK") +set(WITH_BINDING_DOCS FALSE CACHE BOOL "Build C/Python HTML Documentation with Sphinx") set(FFMPEG_FOUND ${WITH_CODEC_FFMPEG}) set(JACK_FOUND ${WITH_JACK}) set(LIBSNDFILE_FOUND ${WITH_CODEC_SNDFILE}) @@ -26,5 +25,7 @@ set(NUMPY_INCLUDE_DIRS ${PYTHON_NUMPY_INCLUDE_DIRS}) set(SDL_FOUND ${WITH_SDL}) if(WIN32) - set(DEFAULT_PLUGIN_PATH "plugins") + set(DEFAULT_PLUGIN_PATH "plugins" CACHE STRING "Default plugin installation and loading path.") endif() + +mark_as_advanced(BUILD_DEMOS SHARED_LIBRARY WITH_C WITH_DOCS WITH_FFMPEG WITH_FFTW WITH_LIBSNDFILE SEPARATE_C PLUGIN_FFMPEG PLUGIN_JACK PLUGIN_LIBSNDFILE PLUGIN_OPENAL PLUGIN_SDL WITH_PYTHON_MODULE DYNLOAD_JACK WITH_BINDING_DOCS DEFAULT_PLUGIN_PATH) -- cgit v1.2.3