From 0e1a5d627905cd629ab2c639bc34c253c49cc792 Mon Sep 17 00:00:00 2001 From: Jeff Hutchinson Date: Fri, 16 Sep 2022 19:23:16 -0400 Subject: [PATCH] Update cmake mark_advanced for sdl and libpng --- Tools/CMake/libraries/lpng.cmake | 5 +- Tools/CMake/torque3d.cmake | 127 ++++++++++++++++++------------- 2 files changed, 80 insertions(+), 52 deletions(-) diff --git a/Tools/CMake/libraries/lpng.cmake b/Tools/CMake/libraries/lpng.cmake index 480e6c2b6..e14f6a36b 100644 --- a/Tools/CMake/libraries/lpng.cmake +++ b/Tools/CMake/libraries/lpng.cmake @@ -26,7 +26,7 @@ project(lpng) # Enables NEON for libpng if ( TORQUE_CPU_ARM32 OR TORQUE_CPU_ARM64 ) - set(PNG_INTEL_NEON on CACHE STRING "") + set(PNG_ARM_NEON on CACHE STRING "") add_definitions(-DPNG_ARM_NEON_OPT=1) addPath("${libDir}/lpng/arm") else() @@ -44,6 +44,9 @@ else() add_definitions(-DPNG_INTEL_SSE_OPT=0) endif() +mark_as_advanced(PNG_INTEL_SSE) +mark_as_advanced(PNG_ARM_NEON) + addInclude(${libDir}/zlib) finishLibrary("${libDir}/${PROJECT_NAME}") diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake index 0fd154d06..b8e18bdb1 100644 --- a/Tools/CMake/torque3d.cmake +++ b/Tools/CMake/torque3d.cmake @@ -810,33 +810,33 @@ if(TORQUE_SDL) addLib(SDL2) endif() - 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) + SET(SDL_WAYLAND OFF CACHE BOOL "" FORCE) + mark_as_advanced(SDL_3DNOW) + mark_as_advanced(SDL_ALSA) + mark_as_advanced(SDL_ALTIVEC) + mark_as_advanced(SDL_ARTS) + mark_as_advanced(SDL_ASSEMBLY) + mark_as_advanced(SDL_ASSERTIONS) + mark_as_advanced(SDL_DIRECTX) + mark_as_advanced(SDL_DISKAUDIO) + mark_as_advanced(SDL_DUMMYAUDIO) + mark_as_advanced(SDL_ESD) + mark_as_advanced(SDL_FUSIONSOUND) + mark_as_advanced(SDL_INPUT_TSLIB) + mark_as_advanced(SDL_LIBC) + mark_as_advanced(SDL_MMX) + mark_as_advanced(SDL_NAS) + mark_as_advanced(SDL_NAS_SHARED) + mark_as_advanced(SDL_OSS) + mark_as_advanced(SDL_PTHREADS) + mark_as_advanced(SDL_PULSEAUDIO) + mark_as_advanced(SDL_RENDER_D3D) + mark_as_advanced(SDL_RPATH) + mark_as_advanced(SDL_SNDIO) + mark_as_advanced(SDL_SSE) + mark_as_advanced(SDL_SSE2) + mark_as_advanced(SDL_SSEMATH) + mark_as_advanced(SDL_WINDRES) mark_as_advanced(SDL_ATOMIC) mark_as_advanced(SDL_AUDIO) mark_as_advanced(SDL_CPUINFO) @@ -854,35 +854,60 @@ if(TORQUE_SDL) 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) - set(VIDEO_WAYLAND OFF) - 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) - set(VIDEO_OPENGLES OFF) - mark_as_advanced(VIDEO_RPI) - set(VIDEO_RPI OFF) - mark_as_advanced(VIDEO_VIVANTE) - set(VIDEO_VIVANTE OFF) + mark_as_advanced(SDL_CLOCK_GETTIME) + mark_as_advanced(SDL_GCC_ATOMICS) + mark_as_advanced(SDL_WAYLAND) + set(SDL_WAYLAND OFF) + mark_as_advanced(SDL_COCOA) + mark_as_advanced(SDL_DIRECTFB) + mark_as_advanced(SDL_DUMMY) + mark_as_advanced(SDL_MIR) + mark_as_advanced(SDL_OPENGL) + mark_as_advanced(SDL_OPENGLES) + set(SDL_OPENGLES OFF) + mark_as_advanced(SDL_RPI) + set(SDL_RPI OFF) + mark_as_advanced(SDL_VIVANTE) + set(SDL_VIVANTE OFF) mark_as_advanced(VIDEO_X11) - set(VIDEO_X11 OFF) - mark_as_advanced(VIDEO_VULKAN) - set(VIDEO_VULKAN OFF) - mark_as_advanced(VIDEO_KMSDRM) - set(VIDEO_KMSDRM OFF) - mark_as_advanced(WASAPI) - mark_as_advanced(SS3) + set(SDL_X11 OFF) + mark_as_advanced(SDL_VULKAN) + set(SDL_VULKAN OFF) + mark_as_advanced(SDL_KMSDRM) + set(SDL_KMSDRM OFF) + mark_as_advanced(SDL_WASAPI) + mark_as_advanced(SDL_SSE3) mark_as_advanced(SDL_TEST) set(SDL_TEST OFF) mark_as_advanced(SDL_SENSOR) set(SDL_SENSOR OFF) - mark_as_advanced(BACKGROUNDING_SIGNAL) - mark_as_advanced(FOREGROUNDING_SIGNAL) + mark_as_advanced(SDL_BACKGROUNDING_SIGNAL) + mark_as_advanced(SDL_FOREGROUNDING_SIGNAL) + set(SDL_Metal OFF) + mark_as_advanced(SDL_METAL) + mark_as_advanced(SDL2_DISABLE_INSTALL) + mark_as_advanced(SDL2_DISABLE_SDL2MAIN) + mark_as_advanced(SDL2_DISABLE_UNINSTALL) + mark_as_advanced(SDL_ARMNEON) + mark_as_advanced(SDL_ARMSIMD) + mark_as_advanced(SDL_ASAN) + mark_as_advanced(SDL_DUMMYVIDEO) + mark_as_advanced(SDL_HIDAPI) + mark_as_advanced(SDL_HIDAPI_JOYSTICK) + mark_as_advanced(SDL_INSTALL_TESTS) + mark_as_advanced(SDL_JACK) + mark_as_advanced(SDL_LIBSAMPLERATE) + mark_as_advanced(SDL_LOCALE) + mark_as_advanced(SDL_MISC) + mark_as_advanced(SDL_OFFSCREEN) + mark_as_advanced(SDL_PIPEWIRE) + mark_as_advanced(SDL_PTHREADS_SEM) + mark_as_advanced(SDL_RENDER_METAL) + mark_as_advanced(SDL_SNDIO_SHARED) + mark_as_advanced(SDL_STATIC_PIC) + mark_as_advanced(SDL_VIRTUAL_JOYSTICK) + mark_as_advanced(SDL_X11) + mark_as_advanced(SDL_XINPUT) endif() if(TORQUE_STATIC_CODE_ANALYSIS)