Cleans up a few cmake options and flags a most of the alsoft and sdl options as advanced so they're not cluttering up the regular view for no reason

This commit is contained in:
Areloch 2017-01-17 01:10:24 -06:00
parent 16baa4d51a
commit f43bfd6ca2

View file

@ -67,17 +67,63 @@ endif()
option(TORQUE_SFX_OPENAL "OpenAL Sound" ON)
#windows uses openal-soft
if(WIN32)
#disable a few things that are not required
set(ALSOFT_TESTS OFF CACHE BOOL "Build and install test programs" FORCE)
set(ALSOFT_UTILS OFF CACHE BOOL "Build and install utility programs" FORCE)
set(ALSOFT_EXAMPLES OFF CACHE BOOL "Build and install example programs" FORCE)
set(ALSOFT_CONFIG OFF CACHE BOOL "Install alsoft.conf sample configuration file" FORCE)
set(ALSOFT_INSTALL OFF CACHE BOOL "Install headers and libraries" FORCE)
set(ALSOFT_NO_CONFIG_UTIL OFF CACHE BOOL "Disable building the alsoft-config utility" FORCE)
set(ALSOFT_HRTF_DEFS OFF CACHE BOOL "Install HRTF definition files" FORCE)
set(ALSOFT_AMBDEC_PRESETS OFF CACHE BOOL "Install AmbDec presets" FORCE)
add_subdirectory( ${libDir}/openal-soft ${CMAKE_CURRENT_BINARY_DIR}/openal-soft)
#disable a few things that are not required
set(ALSOFT_TESTS OFF CACHE BOOL "Build and install test programs" FORCE)
set(ALSOFT_UTILS OFF CACHE BOOL "Build and install utility programs" FORCE)
set(ALSOFT_EXAMPLES OFF CACHE BOOL "Build and install example programs" FORCE)
set(ALSOFT_CONFIG OFF CACHE BOOL "Install alsoft.conf sample configuration file" FORCE)
set(ALSOFT_INSTALL OFF CACHE BOOL "Install headers and libraries" FORCE)
set(ALSOFT_NO_CONFIG_UTIL OFF CACHE BOOL "Disable building the alsoft-config utility" FORCE)
set(ALSOFT_HRTF_DEFS OFF CACHE BOOL "Install HRTF definition files" FORCE)
set(ALSOFT_AMBDEC_PRESETS OFF CACHE BOOL "Install AmbDec presets" FORCE)
add_subdirectory( ${libDir}/openal-soft ${CMAKE_CURRENT_BINARY_DIR}/openal-soft)
endif()
if(TORQUE_SFX_OPENAL)
#Hide some unnecessary fields as advanced
mark_as_advanced(ALSOFT_AMBDEC_PRESETS)
mark_as_advanced(ALSOFT_BACKEND_DSOUND)
mark_as_advanced(ALSOFT_BACKEND_MMDEVAPI)
mark_as_advanced(ALSOFT_BACKEND_WAVE)
mark_as_advanced(ALSOFT_BACKEND_WINMM)
mark_as_advanced(ALSOFT_CONFIG)
mark_as_advanced(ALSOFT_CPUEXT_SSE)
mark_as_advanced(ALSOFT_CPUEXT_SSE2)
mark_as_advanced(ALSOFT_CPUEXT_SSE3)
mark_as_advanced(ALSOFT_CPUEXT_SSE4_1)
mark_as_advanced(ALSOFT_DLOPEN)
mark_as_advanced(ALSOFT_EMBED_HRTF_DATA)
mark_as_advanced(ALSOFT_EXAMPLES)
mark_as_advanced(ALSOFT_HRTF_DEFS)
mark_as_advanced(ALSOFT_INSTALL)
mark_as_advanced(ALSOFT_NO_CONFIG_UTIL)
mark_as_advanced(ALSOFT_NO_UID_DEFS)
mark_as_advanced(ALSOFT_REQUIRE_ALSA)
mark_as_advanced(ALSOFT_REQUIRE_COREAUDIO)
mark_as_advanced(ALSOFT_REQUIRE_DSOUND)
mark_as_advanced(ALSOFT_REQUIRE_JACK)
mark_as_advanced(ALSOFT_REQUIRE_MMDEVAPI)
mark_as_advanced(ALSOFT_REQUIRE_NEON)
mark_as_advanced(ALSOFT_REQUIRE_OPENSL)
mark_as_advanced(ALSOFT_REQUIRE_OSS)
mark_as_advanced(ALSOFT_REQUIRE_PORTAUDIO)
mark_as_advanced(ALSOFT_REQUIRE_PULSEAUDIO)
mark_as_advanced(ALSOFT_REQUIRE_QSA)
mark_as_advanced(ALSOFT_REQUIRE_SNDIO)
mark_as_advanced(ALSOFT_REQUIRE_SOLARIS)
mark_as_advanced(ALSOFT_REQUIRE_SSE)
mark_as_advanced(ALSOFT_REQUIRE_SSE2)
mark_as_advanced(ALSOFT_REQUIRE_SSE4_1)
mark_as_advanced(ALSOFT_REQUIRE_WINMM)
mark_as_advanced(ALSOFT_TESTS)
mark_as_advanced(ALSOFT_UTILS)
mark_as_advanced(ALSOFT_WERROR)
mark_as_advanced(COREAUDIO_FRAMEWORK)
mark_as_advanced(CMAKE_DEBUG_POSTFIX)
mark_as_advanced(FORCE_STATIC_VCRT)
endif()
mark_as_advanced(TORQUE_SFX_OPENAL)
option(TORQUE_HIFI "HIFI? support" OFF)
mark_as_advanced(TORQUE_HIFI)
@ -690,6 +736,63 @@ if(TORQUE_SDL)
addDef(TORQUE_SDL)
addInclude(${libDir}/sdl/include)
addLib(SDL2)
SET(VIDEO_WAYLAND OFF CACHE BOOL "" FORCE)
mark_as_advanced(3DNOW)
mark_as_advanced(ALSA)
mark_as_advanced(ALTIVEC)
mark_as_advanced(ARTS)
mark_as_advanced(ASSEMBLY)
mark_as_advanced(ASSERTIONS)
mark_as_advanced(DIRECTX)
mark_as_advanced(DISKAUDIO)
mark_as_advanced(DUMMYAUDIO)
mark_as_advanced(ESD)
mark_as_advanced(FUSIONSOUND)
mark_as_advanced(INPUT_TSLIB)
mark_as_advanced(LIBC)
mark_as_advanced(MMX)
mark_as_advanced(NAS)
mark_as_advanced(NAS_SHARED)
mark_as_advanced(OSS)
mark_as_advanced(PTHREADS)
mark_as_advanced(PULSEAUDIO)
mark_as_advanced(RENDER_D3D)
mark_as_advanced(RPATH)
mark_as_advanced(SNDIO)
mark_as_advanced(SSE)
mark_as_advanced(SSE2)
mark_as_advanced(SSEMATH)
mark_as_advanced(WINDRES)
mark_as_advanced(SDL_ATOMIC)
mark_as_advanced(SDL_AUDIO)
mark_as_advanced(SDL_CPUINFO)
mark_as_advanced(SDL_DLOPEN)
mark_as_advanced(SDL_EVENTS)
mark_as_advanced(SDL_FILE)
mark_as_advanced(SDL_FILESYSTEM)
mark_as_advanced(SDL_HAPTIC)
mark_as_advanced(SDL_JOYSTICK)
mark_as_advanced(SDL_LOADSO)
mark_as_advanced(SDL_POWER)
mark_as_advanced(SDL_RENDER)
mark_as_advanced(SDL_SHARED)
mark_as_advanced(SDL_STATIC)
mark_as_advanced(SDL_THREADS)
mark_as_advanced(SDL_TIMERS)
mark_as_advanced(SDL_VIDEO)
mark_as_advanced(CLOCK_GETTIME)
mark_as_advanced(GCC_ATOMICS)
mark_as_advanced(VIDEO_WAYLAND)
mark_as_advanced(VIDEO_COCOA)
mark_as_advanced(VIDEO_DIRECTFB)
mark_as_advanced(VIDEO_DUMMY)
mark_as_advanced(VIDEO_MIR)
mark_as_advanced(VIDEO_OPENGL)
mark_as_advanced(VIDEO_OPENGLES)
mark_as_advanced(VIDEO_RPI)
mark_as_advanced(VIDEO_VIVANTE)
mark_as_advanced(VIDEO_X11)
endif()
if(TORQUE_STATIC_CODE_ANALYSIS)