diff --git a/server_v2/CMakeLists.txt b/server_v2/CMakeLists.txt
index 186acf1..90d4b2e 100644
--- a/server_v2/CMakeLists.txt
+++ b/server_v2/CMakeLists.txt
@@ -13,13 +13,7 @@ endif ()
 find_package(Protobuf REQUIRED)
 find_package(spdlog REQUIRED)
 
-if (APPLE)
-    set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -gdwarf-3")
-    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wextra -gdwarf-3")
-
-    set(LIBRARIES "spdlog::spdlog")
-elseif (UNIX)
+if (UNIX AND ${CMAKE_SYSTEM_PROCESSOR} STREQUAL armv7l)
     message("Running on Raspberry Pi")
     add_definitions(-DIS_RASPI)
     set(CMAKE_CXX_FLAGS_RELEASE "-O3")
@@ -27,6 +21,16 @@ elseif (UNIX)
     find_package(pigpio REQUIRED)
     set(LIBRARIES "pigpio" "spdlog::spdlog")
     set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-psabi")
+
+    set(IS_RASPI)
+endif ()
+
+if (NOT IS_RASPI)
+    set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -gdwarf-3")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wextra -gdwarf-3")
+
+    set(LIBRARIES "spdlog::spdlog")
 endif ()
 
 message("CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}")