diff options
| author | irungentoo <irungentoo@gmail.com> | 2013-08-15 16:57:34 -0700 |
|---|---|---|
| committer | irungentoo <irungentoo@gmail.com> | 2013-08-15 16:57:34 -0700 |
| commit | 75873e31db5a881cdd0caf408c192e91b1901149 (patch) | |
| tree | 7fcb0f26a101363a7efcb9868a9ec8f2be6e1e1f /testing/CMakeLists.txt | |
| parent | 9e3d5d6488b402805509befbf9619d9fc589b58b (diff) | |
| parent | d93b5e2cb8c1af1885969448097c7426b27b0b6a (diff) | |
Merge pull request #475 from nurupo/master
Commented out nTox_win32 in cmake
Diffstat (limited to 'testing/CMakeLists.txt')
| -rw-r--r-- | testing/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index 65ba35c0..9e07135c 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt | |||
| @@ -12,7 +12,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/crypto_speed_test.cmake) | |||
| 12 | include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/timer_test.cmake) | 12 | include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/timer_test.cmake) |
| 13 | 13 | ||
| 14 | if(WIN32) | 14 | if(WIN32) |
| 15 | include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake) | 15 | # include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake) |
| 16 | else() | 16 | else() |
| 17 | include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake) | 17 | include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake) |
| 18 | add_subdirectory(toxic) | 18 | add_subdirectory(toxic) |