From 7ab16c5c5dddf8adc0dae7cc2409725bd64a09b5 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Fri, 28 May 2021 09:56:47 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20CMake:=20Cleanup=20Nintendo=20Sw?=
 =?UTF-8?q?itch=20variables?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .circleci/config.yml    | 2 +-
 CMake/switch_defs.cmake | 3 +++
 CMakeLists.txt          | 4 ----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3e8863ad3..715bf5377 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,7 +37,7 @@ jobs:
     working_directory: ~/repo
     steps:
       - checkout
-      - run: /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON -DNONET=ON
+      - run: /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON
       - run: cmake --build build -j 2
       - store_artifacts: {path: ./build/devilutionx.nro, destination: devilutionx.nro}
   3ds:
diff --git a/CMake/switch_defs.cmake b/CMake/switch_defs.cmake
index bd3f0d347..d156ffb13 100644
--- a/CMake/switch_defs.cmake
+++ b/CMake/switch_defs.cmake
@@ -1,3 +1,6 @@
+set(ASAN OFF)
+set(UBSAN OFF)
+
 set(NONET ON)
 set(PREFILL_PLAYER_NAME ON)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8726b50f..7e91daeb0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,10 +132,6 @@ if(GPERF)
 endif()
 
 if(NINTENDO_SWITCH)
-  set(ASAN OFF)
-  set(UBSAN OFF)
-  set(NONET ON)
-  set(PREFILL_PLAYER_NAME ON)
   include(switch_defs)
 endif()