diff options
author | jin-eld <jin at mediatomb dot cc> | 2013-08-24 03:36:43 +0300 |
---|---|---|
committer | jin-eld <jin at mediatomb dot cc> | 2013-08-24 03:36:43 +0300 |
commit | 1ec70337cfbf42f5f10d20c6152cdc5cf635df1b (patch) | |
tree | 0d2d86c9d092610fc6495b5d7c6c4ec940b75a8a /other | |
parent | 974b8fb8bfea5529b26e2b037bd1a5bf5d9513b7 (diff) |
Remove cmake build system
Diffstat (limited to 'other')
-rw-r--r-- | other/CMakeLists.txt | 23 | ||||
-rw-r--r-- | other/Makefile.inc | 4 | ||||
-rw-r--r-- | other/bootstrap_serverdaemon/CMakeLists.txt | 19 | ||||
-rw-r--r-- | other/bootstrap_serverdaemon/Makefile.inc | 6 | ||||
-rw-r--r-- | other/bootstrap_serverdaemon/cmake/Modules/FindLibConfig.cmake | 73 | ||||
-rw-r--r-- | other/cmake/DHT_bootstrap.cmake | 10 |
6 files changed, 2 insertions, 133 deletions
diff --git a/other/CMakeLists.txt b/other/CMakeLists.txt deleted file mode 100644 index 7e6c9eb9..00000000 --- a/other/CMakeLists.txt +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | cmake_minimum_required(VERSION 2.6.0) | ||
2 | |||
3 | cmake_policy(SET CMP0011 NEW) | ||
4 | |||
5 | if(WIN32) | ||
6 | file(MAKE_DIRECTORY "$ENV{APPDATA}/.config/tox") | ||
7 | file(INSTALL DHTservers DESTINATION "$ENV{APPDATA}/.config/tox") | ||
8 | else() | ||
9 | set(HOME "$ENV{HOME}") | ||
10 | if(APPLE) | ||
11 | file(MAKE_DIRECTORY ${HOME}/Library/Application\ Support/.config/tox) | ||
12 | file(INSTALL DHTservers DESTINATION ${HOME}/Library/Application\ Support/.config/tox) | ||
13 | else() | ||
14 | file(MAKE_DIRECTORY ${HOME}/.config/tox) | ||
15 | file(INSTALL DHTservers DESTINATION ${HOME}/.config/tox) | ||
16 | endif() | ||
17 | endif() | ||
18 | |||
19 | include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_bootstrap.cmake) | ||
20 | |||
21 | if(LINUX) | ||
22 | add_subdirectory(bootstrap_serverdaemon) | ||
23 | endif() | ||
diff --git a/other/Makefile.inc b/other/Makefile.inc index 4f195e63..10ef55a3 100644 --- a/other/Makefile.inc +++ b/other/Makefile.inc | |||
@@ -14,7 +14,5 @@ DHT_bootstrap_LDADD = $(LIBSODIUM_LDFLAGS) \ | |||
14 | $(LIBSODIUM_LIBS) \ | 14 | $(LIBSODIUM_LIBS) \ |
15 | $(WINSOCK2_LIBS) | 15 | $(WINSOCK2_LIBS) |
16 | 16 | ||
17 | EXTRA_DIST += $(top_srcdir)/other/cmake/DHT_bootstrap.cmake \ | 17 | EXTRA_DIST += $(top_srcdir)/other/DHTservers \ |
18 | $(top_srcdir)/other/CMakeLists.txt \ | ||
19 | $(top_srcdir)/other/DHTservers \ | ||
20 | $(top_srcdir)/other/tox.png | 18 | $(top_srcdir)/other/tox.png |
diff --git a/other/bootstrap_serverdaemon/CMakeLists.txt b/other/bootstrap_serverdaemon/CMakeLists.txt deleted file mode 100644 index 512179f3..00000000 --- a/other/bootstrap_serverdaemon/CMakeLists.txt +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | cmake_minimum_required(VERSION 2.6.0) | ||
2 | project(DHT_bootstrap_daemon C) | ||
3 | |||
4 | set(exe_name DHT_bootstrap_daemon) | ||
5 | |||
6 | find_package(LIBCONFIG REQUIRED) | ||
7 | |||
8 | include_directories(${LIBCONFIG_INCLUDE_DIR}) | ||
9 | |||
10 | add_executable(${exe_name} | ||
11 | DHT_bootstrap_daemon.c) | ||
12 | |||
13 | target_link_libraries(${exe_name} | ||
14 | ${LIBCONFIG_LIBRARY}) | ||
15 | |||
16 | linkCoreLibraries(${exe_name}) | ||
17 | |||
18 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules") | ||
19 | find_package(LibConfig REQUIRED) | ||
diff --git a/other/bootstrap_serverdaemon/Makefile.inc b/other/bootstrap_serverdaemon/Makefile.inc index a04475c5..1320b761 100644 --- a/other/bootstrap_serverdaemon/Makefile.inc +++ b/other/bootstrap_serverdaemon/Makefile.inc | |||
@@ -20,8 +20,4 @@ endif | |||
20 | 20 | ||
21 | EXTRA_DIST += \ | 21 | EXTRA_DIST += \ |
22 | $(top_srcdir)/other/bootstrap_serverdaemon/server.cfg \ | 22 | $(top_srcdir)/other/bootstrap_serverdaemon/server.cfg \ |
23 | $(top_srcdir)/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.sh \ | 23 | $(top_srcdir)/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.sh |
24 | $(top_srcdir)/other/bootstrap_serverdaemon/cmake/Modules \ | ||
25 | $(top_srcdir)/other/bootstrap_serverdaemon/cmake/Modules/FindLibConfig.cmake \ | ||
26 | $(top_srcdir)/other/bootstrap_serverdaemon/cmake/Modules/FindLibConfig.cmake \ | ||
27 | $(top_srcdir)/other/bootstrap_serverdaemon/CMakeLists.txt | ||
diff --git a/other/bootstrap_serverdaemon/cmake/Modules/FindLibConfig.cmake b/other/bootstrap_serverdaemon/cmake/Modules/FindLibConfig.cmake deleted file mode 100644 index 7d6270e6..00000000 --- a/other/bootstrap_serverdaemon/cmake/Modules/FindLibConfig.cmake +++ /dev/null | |||
@@ -1,73 +0,0 @@ | |||
1 | #Ref: https://github.com/schnorr/pajeng/blob/master/cmake/FindLibConfig.cmake | ||
2 | # | ||
3 | # This module defines | ||
4 | # LIBCONFIG_INCLUDE_DIR, where to find cppunit include files, etc. | ||
5 | # LIBCONFIG_LIBRARIES, the libraries to link against to use CppUnit. | ||
6 | # LIBCONFIG_STATIC_LIBRARIY_PATH | ||
7 | # LIBCONFIG_FOUND, If false, do not try to use CppUnit. | ||
8 | |||
9 | # also defined, but not for general use are | ||
10 | # LIBCONFIG_LIBRARY, where to find the CUnit library. | ||
11 | |||
12 | #MESSAGE("Searching for libconfig library") | ||
13 | |||
14 | FIND_PATH(LIBCONFIG_INCLUDE_DIR libconfig.h | ||
15 | /usr/local/include | ||
16 | /usr/include | ||
17 | ) | ||
18 | |||
19 | FIND_PATH(LIBCONFIGPP_INCLUDE_DIR libconfig.h++ | ||
20 | /usr/local/include | ||
21 | /usr/include | ||
22 | ) | ||
23 | |||
24 | FIND_LIBRARY(LIBCONFIG_LIBRARY config | ||
25 | /usr/local/lib | ||
26 | /usr/lib | ||
27 | ) | ||
28 | |||
29 | FIND_LIBRARY(LIBCONFIGPP_LIBRARY config++ | ||
30 | /usr/local/lib | ||
31 | /usr/lib | ||
32 | ) | ||
33 | |||
34 | FIND_LIBRARY(LIBCONFIG_STATIC_LIBRARY "libconfig${CMAKE_STATIC_LIBRARY_SUFFIX}" | ||
35 | /usr/local/lib | ||
36 | /usr/lib | ||
37 | ) | ||
38 | |||
39 | FIND_LIBRARY(LIBCONFIGPP_STATIC_LIBRARY "libconfig++${CMAKE_STATIC_LIBRARY_SUFFIX}" | ||
40 | /usr/local/lib | ||
41 | /usr/lib | ||
42 | ) | ||
43 | |||
44 | |||
45 | IF(LIBCONFIG_INCLUDE_DIR) | ||
46 | IF(LIBCONFIG_LIBRARY) | ||
47 | SET(LIBCONFIG_FOUND TRUE) | ||
48 | SET(LIBCONFIG_LIBRARIES ${LIBCONFIG_LIBRARY}) | ||
49 | SET(LIBCONFIG_STATIC_LIBRARY_PATH ${LIBCONFIG_STATIC_LIBRARY}) | ||
50 | ENDIF(LIBCONFIG_LIBRARY) | ||
51 | ENDIF(LIBCONFIG_INCLUDE_DIR) | ||
52 | |||
53 | IF(LIBCONFIGPP_INCLUDE_DIR) | ||
54 | IF(LIBCONFIGPP_LIBRARY) | ||
55 | SET(LIBCONFIGPP_FOUND TRUE) | ||
56 | SET(LIBCONFIGPP_LIBRARIES ${LIBCONFIGPP_LIBRARY}) | ||
57 | SET(LIBCONFIGPP_STATIC_LIBRARY_PATH ${LIBCONFIGPP_STATIC_LIBRARY}) | ||
58 | ENDIF(LIBCONFIGPP_LIBRARY) | ||
59 | ENDIF(LIBCONFIGPP_INCLUDE_DIR) | ||
60 | |||
61 | IF (LIBCONFIG_FOUND) | ||
62 | IF (NOT LibConfig_FIND_QUIETLY) | ||
63 | MESSAGE(STATUS "Found LibConfig++: ${LIBCONFIGPP_LIBRARIES}" ) | ||
64 | MESSAGE(STATUS "Found LibConfig: ${LIBCONFIG_LIBRARIES}") | ||
65 | MESSAGE(STATUS "static LibConfig path: ${LIBCONFIG_STATIC_LIBRARY_PATH}") | ||
66 | ENDIF (NOT LibConfig_FIND_QUIETLY) | ||
67 | ELSE (LIBCONFIG_FOUND) | ||
68 | IF (LibConfig_FIND_REQUIRED) | ||
69 | MESSAGE(SEND_ERROR "Could NOT find LibConfig") | ||
70 | ENDIF (LibConfig_FIND_REQUIRED) | ||
71 | ENDIF (LIBCONFIG_FOUND) | ||
72 | |||
73 | MARK_AS_ADVANCED(LIBCONFIG_INCLUDE_DIR LIBCONFIG_LIBRARIES) | ||
diff --git a/other/cmake/DHT_bootstrap.cmake b/other/cmake/DHT_bootstrap.cmake deleted file mode 100644 index 403522ab..00000000 --- a/other/cmake/DHT_bootstrap.cmake +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | cmake_minimum_required(VERSION 2.6.0) | ||
2 | project(DHT_bootstrap C) | ||
3 | |||
4 | set(exe_name DHT_bootstrap) | ||
5 | |||
6 | add_executable(${exe_name} | ||
7 | DHT_bootstrap.c | ||
8 | ../testing/misc_tools.c) | ||
9 | |||
10 | linkCoreLibraries(${exe_name}) | ||