diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26f56e4c1..c1fa8cad2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,23 @@
 cmake_minimum_required(VERSION 2.6.0)
-project(TOX)
+project(TOX C)
  
 set(core_sources
         core/DHT.c)
 	
 set(test_sources
         testing/DHT_test.c)
+	
+set(exe_name TOX-app)
  
-add_executable(TOX-app
+add_executable(${exe_name}
 	${core_sources}
 	${test_sources})
 
-
 if(WIN32)
-	target_link_libraries(TOX-app ws2_32)
-endif(WIN32)
\ No newline at end of file
+	target_link_libraries(${exe_name} ws2_32)
+endif()
+
+if(CMAKE_COMPILER_IS_GNUCC)
+	message(STATUS "==== GCC detected - Adding compiler flags")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
+endif()
\ No newline at end of file