From 77ccc412f5a978b4cfb5c0711eb3961c3728e7c7 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Sat, 13 Dec 2014 02:40:52 -0500 Subject: [PATCH] CMake: Minor cleanup up on the new SDL_*_ENABLED_BY_DEFAULT vars. --- CMakeLists.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 77f870856f639..c8296d71f6cff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -200,6 +200,8 @@ add_definitions(-DUSING_GENERATED_CONFIG_H) # General includes include_directories(${SDL2_BINARY_DIR}/include ${SDL2_SOURCE_DIR}/include) +# All these ENABLED_BY_DEFAULT vars will default to ON if not specified, so +# you only need to have a platform override them if they are disabling. if(EMSCRIPTEN) # Set up default values for the currently supported set of subsystems: # Emscripten/Javascript does not have assembly support, a dynamic library @@ -211,13 +213,6 @@ if(EMSCRIPTEN) set(SDL_LOADSO_ENABLED_BY_DEFAULT OFF) set(SDL_CPUINFO_ENABLED_BY_DEFAULT OFF) set(DLOPEN_ENABLED_BY_DEFAULT OFF) -else() - set(SDL_SHARED_ENABLED_BY_DEFAULT ON) - set(SDL_ATOMIC_ENABLED_BY_DEFAULT ON) - set(SDL_THREADS_ENABLED_BY_DEFAULT ON) - set(SDL_LOADSO_ENABLED_BY_DEFAULT ON) - set(SDL_CPUINFO_ENABLED_BY_DEFAULT ON) - set(DLOPEN_ENABLED_BY_DEFAULT ON) endif() set(SDL_SUBSYSTEMS