diff options
| author | Astonex <softukitu@gmail.com> | 2013-07-31 23:02:09 +0100 |
|---|---|---|
| committer | Astonex <softukitu@gmail.com> | 2013-07-31 23:02:09 +0100 |
| commit | f05aa308701f33f3bf9df022a4b376deeedef235 (patch) | |
| tree | c10b8a3cca6822400853bfd3bc2c5fd1cca73f83 /testing/CMakeLists.txt | |
| parent | 8dfba27242ca23fca5de852541f2101568dbf7cb (diff) | |
| parent | c558cb63f6db35bd51f2f2331e21df03105ee82a (diff) | |
Merge remote-tracking branch 'ProjectTox/master'
Diffstat (limited to 'testing/CMakeLists.txt')
| -rw-r--r-- | testing/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index 988efe42..abbc278e 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt | |||
| @@ -11,8 +11,8 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Messenger_test.cmake) | |||
| 11 | if(WIN32) | 11 | if(WIN32) |
| 12 | include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake) | 12 | include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake) |
| 13 | endif() | 13 | endif() |
| 14 | |||
| 14 | if(NOT WIN32) | 15 | if(NOT WIN32) |
| 15 | include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake) | 16 | include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake) |
| 16 | include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toxic.cmake) | 17 | add_subdirectory(toxic) |
| 17 | |||
| 18 | endif() | 18 | endif() |