From 1d8f6e94e73c569f09a2bc8bd008d0ceb2e5b8cc Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Mon, 29 Jul 2013 20:45:53 -0400 Subject: Fixed formatting of some cmake files --- testing/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testing/CMakeLists.txt') diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index 3085b0c5..86f95dc8 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -8,8 +8,8 @@ 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) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Messenger_test.cmake) + if(NOT WIN32) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake) -include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toxic.cmake) - + add_subdirectory(other) endif() -- cgit v1.2.3 From 5a6645709b72e932ff8d47f3141d3f7346b49a5f Mon Sep 17 00:00:00 2001 From: irungentoo Date: Tue, 30 Jul 2013 07:38:47 -0400 Subject: Fixed build. --- testing/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'testing/CMakeLists.txt') diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index af771085..b942e1ca 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -15,5 +15,4 @@ endif() if(NOT WIN32) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toxic.cmake) - add_subdirectory(other) endif() -- cgit v1.2.3 From 184eaacd2a0e49277367001b209f1844ea017ace Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Tue, 30 Jul 2013 11:55:46 -0400 Subject: Fixed cmake --- testing/CMakeLists.txt | 6 +++--- testing/cmake/toxic.cmake | 11 ----------- testing/toxic/CMakeLists.txt | 4 ++-- 3 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 testing/cmake/toxic.cmake (limited to 'testing/CMakeLists.txt') diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index b942e1ca..abbc278e 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -9,10 +9,10 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testclient.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testserver.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Messenger_test.cmake) if(WIN32) - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake) endif() if(NOT WIN32) - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake) - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toxic.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake) + add_subdirectory(toxic) endif() 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 @@ -cmake_minimum_required(VERSION 2.6.0) -project(toxic C) - -set(exe_name toxic) - -add_executable(${exe_name} - toxic/main.c toxic/prompt.c) - -target_link_libraries(${exe_name} curses) - -linkCoreLibraries(${exe_name}) diff --git a/testing/toxic/CMakeLists.txt b/testing/toxic/CMakeLists.txt index 43eb379a..4f9785d5 100644 --- a/testing/toxic/CMakeLists.txt +++ b/testing/toxic/CMakeLists.txt @@ -4,8 +4,8 @@ project(toxic C) set(exe_name toxic) add_executable(${exe_name} - toxic/main.c - toxic/prompt.c) + main.c + prompt.c) target_link_libraries(${exe_name} curses) -- cgit v1.2.3