From 184eaacd2a0e49277367001b209f1844ea017ace Mon Sep 17 00:00:00 2001
From: Maxim Biro <nurupo.contributions@gmail.com>
Date: Tue, 30 Jul 2013 11:55:46 -0400
Subject: [PATCH] Fixed cmake

---
 testing/CMakeLists.txt       |  6 +++---
 testing/cmake/toxic.cmake    | 11 -----------
 testing/toxic/CMakeLists.txt |  4 ++--
 3 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 testing/cmake/toxic.cmake

diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index b942e1ca..abbc278e 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -9,10 +9,10 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testclient.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testserver.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Messenger_test.cmake)
 if(WIN32)
-    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake)
+	include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake)
 endif()
 
 if(NOT WIN32)
-    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake)
-    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toxic.cmake)
+	include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake)
+	add_subdirectory(toxic)
 endif()
diff --git a/testing/cmake/toxic.cmake b/testing/cmake/toxic.cmake
deleted file mode 100644
index 1ffab788..00000000
--- a/testing/cmake/toxic.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-cmake_minimum_required(VERSION 2.6.0)
-project(toxic C)
-
-set(exe_name toxic)
-
-add_executable(${exe_name}
-        toxic/main.c toxic/prompt.c)
-	
-target_link_libraries(${exe_name} curses)
-
-linkCoreLibraries(${exe_name})
diff --git a/testing/toxic/CMakeLists.txt b/testing/toxic/CMakeLists.txt
index 43eb379a..4f9785d5 100644
--- a/testing/toxic/CMakeLists.txt
+++ b/testing/toxic/CMakeLists.txt
@@ -4,8 +4,8 @@ project(toxic C)
 set(exe_name toxic)
 
 add_executable(${exe_name}
-	toxic/main.c
-	toxic/prompt.c)
+	main.c
+	prompt.c)
 
 target_link_libraries(${exe_name}
 	curses)