Merge branch 'master' into new-api

1 files changed, 1 insertions, 4 deletions

diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index e3cdc838..9bab6efb 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 2.6.0)
 
 cmake_policy(SET CMP0011 NEW)
 
-#include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_cryptosendfiletest.cmake)
-#include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_sendfiletest.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_test.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testclient.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testserver.cmake)
@@ -11,8 +9,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Messenger_test.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/crypto_speed_test.cmake)
 
 if(WIN32)
-#       include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake)
+  #Do nothing
 else()
         include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake)
-        add_subdirectory(toxic)
 endif()