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/cmake | |
parent | 8dfba27242ca23fca5de852541f2101568dbf7cb (diff) | |
parent | c558cb63f6db35bd51f2f2331e21df03105ee82a (diff) |
Merge remote-tracking branch 'ProjectTox/master'
Diffstat (limited to 'testing/cmake')
-rw-r--r-- | testing/cmake/DHT_cryptosendfiletest.cmake | 3 | ||||
-rw-r--r-- | testing/cmake/DHT_sendfiletest.cmake | 2 | ||||
-rw-r--r-- | testing/cmake/DHT_test.cmake | 3 | ||||
-rw-r--r-- | testing/cmake/Lossless_UDP_testclient.cmake | 2 | ||||
-rw-r--r-- | testing/cmake/Lossless_UDP_testserver.cmake | 2 | ||||
-rw-r--r-- | testing/cmake/Messenger_test.cmake | 2 | ||||
-rw-r--r-- | testing/cmake/nTox.cmake | 7 | ||||
-rw-r--r-- | testing/cmake/toxic.cmake | 11 |
8 files changed, 12 insertions, 20 deletions
diff --git a/testing/cmake/DHT_cryptosendfiletest.cmake b/testing/cmake/DHT_cryptosendfiletest.cmake index c98a2bcd..5470d02a 100644 --- a/testing/cmake/DHT_cryptosendfiletest.cmake +++ b/testing/cmake/DHT_cryptosendfiletest.cmake | |||
@@ -4,6 +4,7 @@ project(DHT_cryptosendfiletest C) | |||
4 | set(exe_name DHT_cryptosendfiletest) | 4 | set(exe_name DHT_cryptosendfiletest) |
5 | 5 | ||
6 | add_executable(${exe_name} | 6 | add_executable(${exe_name} |
7 | DHT_cryptosendfiletest.c misc_tools.c) | 7 | DHT_cryptosendfiletest.c |
8 | misc_tools.c) | ||
8 | 9 | ||
9 | linkCoreLibraries(${exe_name}) | 10 | linkCoreLibraries(${exe_name}) |
diff --git a/testing/cmake/DHT_sendfiletest.cmake b/testing/cmake/DHT_sendfiletest.cmake index 93737914..298db46c 100644 --- a/testing/cmake/DHT_sendfiletest.cmake +++ b/testing/cmake/DHT_sendfiletest.cmake | |||
@@ -4,6 +4,6 @@ project(DHT_sendfiletest C) | |||
4 | set(exe_name DHT_sendfiletest) | 4 | set(exe_name DHT_sendfiletest) |
5 | 5 | ||
6 | add_executable(${exe_name} | 6 | add_executable(${exe_name} |
7 | DHT_sendfiletest.c) | 7 | DHT_sendfiletest.c) |
8 | 8 | ||
9 | linkCoreLibraries(${exe_name}) | 9 | linkCoreLibraries(${exe_name}) |
diff --git a/testing/cmake/DHT_test.cmake b/testing/cmake/DHT_test.cmake index 74fdf35d..bb5bf05f 100644 --- a/testing/cmake/DHT_test.cmake +++ b/testing/cmake/DHT_test.cmake | |||
@@ -4,6 +4,7 @@ project(DHT_test C) | |||
4 | set(exe_name DHT_test) | 4 | set(exe_name DHT_test) |
5 | 5 | ||
6 | add_executable(${exe_name} | 6 | add_executable(${exe_name} |
7 | DHT_test.c misc_tools.c) | 7 | DHT_test.c |
8 | misc_tools.c) | ||
8 | 9 | ||
9 | linkCoreLibraries(${exe_name}) | 10 | linkCoreLibraries(${exe_name}) |
diff --git a/testing/cmake/Lossless_UDP_testclient.cmake b/testing/cmake/Lossless_UDP_testclient.cmake index e894d228..5f651807 100644 --- a/testing/cmake/Lossless_UDP_testclient.cmake +++ b/testing/cmake/Lossless_UDP_testclient.cmake | |||
@@ -4,6 +4,6 @@ project(Lossless_UDP_testclient C) | |||
4 | set(exe_name Lossless_UDP_testclient) | 4 | set(exe_name Lossless_UDP_testclient) |
5 | 5 | ||
6 | add_executable(${exe_name} | 6 | add_executable(${exe_name} |
7 | Lossless_UDP_testclient.c) | 7 | Lossless_UDP_testclient.c) |
8 | 8 | ||
9 | linkCoreLibraries(${exe_name}) | 9 | linkCoreLibraries(${exe_name}) |
diff --git a/testing/cmake/Lossless_UDP_testserver.cmake b/testing/cmake/Lossless_UDP_testserver.cmake index 04306c1a..26f9302e 100644 --- a/testing/cmake/Lossless_UDP_testserver.cmake +++ b/testing/cmake/Lossless_UDP_testserver.cmake | |||
@@ -4,6 +4,6 @@ project(Lossless_UDP_testserver C) | |||
4 | set(exe_name Lossless_UDP_testserver) | 4 | set(exe_name Lossless_UDP_testserver) |
5 | 5 | ||
6 | add_executable(${exe_name} | 6 | add_executable(${exe_name} |
7 | Lossless_UDP_testserver.c) | 7 | Lossless_UDP_testserver.c) |
8 | 8 | ||
9 | linkCoreLibraries(${exe_name}) | 9 | linkCoreLibraries(${exe_name}) |
diff --git a/testing/cmake/Messenger_test.cmake b/testing/cmake/Messenger_test.cmake index b2f54d0a..15fcd77b 100644 --- a/testing/cmake/Messenger_test.cmake +++ b/testing/cmake/Messenger_test.cmake | |||
@@ -4,6 +4,6 @@ project(Messenger_test C) | |||
4 | set(exe_name Messenger_test) | 4 | set(exe_name Messenger_test) |
5 | 5 | ||
6 | add_executable(${exe_name} | 6 | add_executable(${exe_name} |
7 | Messenger_test.c misc_tools.c) | 7 | Messenger_test.c misc_tools.c) |
8 | 8 | ||
9 | linkCoreLibraries(${exe_name}) | 9 | linkCoreLibraries(${exe_name}) |
diff --git a/testing/cmake/nTox.cmake b/testing/cmake/nTox.cmake index 4c6905e5..44476b8f 100644 --- a/testing/cmake/nTox.cmake +++ b/testing/cmake/nTox.cmake | |||
@@ -4,8 +4,9 @@ project(nTox C) | |||
4 | set(exe_name nTox) | 4 | set(exe_name nTox) |
5 | 5 | ||
6 | add_executable(${exe_name} | 6 | add_executable(${exe_name} |
7 | nTox.c misc_tools.c) | 7 | nTox.c misc_tools.c) |
8 | 8 | ||
9 | target_link_libraries(${exe_name} ncurses) | 9 | target_link_libraries(${exe_name} |
10 | ncurses) | ||
10 | 11 | ||
11 | linkCoreLibraries(${exe_name}) | 12 | linkCoreLibraries(${exe_name}) |
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 @@ | |||
1 | cmake_minimum_required(VERSION 2.6.0) | ||
2 | project(toxic C) | ||
3 | |||
4 | set(exe_name toxic) | ||
5 | |||
6 | add_executable(${exe_name} | ||
7 | toxic/main.c toxic/prompt.c) | ||
8 | |||
9 | target_link_libraries(${exe_name} curses) | ||
10 | |||
11 | linkCoreLibraries(${exe_name}) | ||