summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2013-08-04 18:26:04 -0700
committerirungentoo <irungentoo@gmail.com>2013-08-04 18:26:04 -0700
commitc1e4365d1d39876f5cb088d7850ae6a3b53d9833 (patch)
treec4fc26c796dba87028f8d91c4d8df9e029d295d5 /testing
parentf6207efef1cf94b6373a5c55cc654deafe63459a (diff)
parentf03dc44e97e993024e42b3a0915de6401d9cecb0 (diff)
Merge pull request #330 from nurupo/master
Fixed Windows build
Diffstat (limited to 'testing')
-rw-r--r--testing/CMakeLists.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index abbc278e..f2a2e95e 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -8,11 +8,10 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_test.cmake)
8include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testclient.cmake) 8include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testclient.cmake)
9include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testserver.cmake) 9include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testserver.cmake)
10include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Messenger_test.cmake) 10include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Messenger_test.cmake)
11
11if(WIN32) 12if(WIN32)
12 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake) 13 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake)
13endif() 14else()
14
15if(NOT WIN32)
16 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake) 15 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake)
17 add_subdirectory(toxic) 16 add_subdirectory(toxic)
18endif() 17endif()