From 1ec70337cfbf42f5f10d20c6152cdc5cf635df1b Mon Sep 17 00:00:00 2001 From: jin-eld Date: Sat, 24 Aug 2013 03:36:43 +0300 Subject: Remove cmake build system --- other/CMakeLists.txt | 23 ------- other/Makefile.inc | 4 +- other/bootstrap_serverdaemon/CMakeLists.txt | 19 ------ other/bootstrap_serverdaemon/Makefile.inc | 6 +- .../cmake/Modules/FindLibConfig.cmake | 73 ---------------------- other/cmake/DHT_bootstrap.cmake | 10 --- 6 files changed, 2 insertions(+), 133 deletions(-) delete mode 100644 other/CMakeLists.txt delete mode 100644 other/bootstrap_serverdaemon/CMakeLists.txt delete mode 100644 other/bootstrap_serverdaemon/cmake/Modules/FindLibConfig.cmake delete mode 100644 other/cmake/DHT_bootstrap.cmake (limited to 'other') 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 @@ -cmake_minimum_required(VERSION 2.6.0) - -cmake_policy(SET CMP0011 NEW) - -if(WIN32) - file(MAKE_DIRECTORY "$ENV{APPDATA}/.config/tox") - file(INSTALL DHTservers DESTINATION "$ENV{APPDATA}/.config/tox") -else() - set(HOME "$ENV{HOME}") - if(APPLE) - file(MAKE_DIRECTORY ${HOME}/Library/Application\ Support/.config/tox) - file(INSTALL DHTservers DESTINATION ${HOME}/Library/Application\ Support/.config/tox) - else() - file(MAKE_DIRECTORY ${HOME}/.config/tox) - file(INSTALL DHTservers DESTINATION ${HOME}/.config/tox) - endif() -endif() - -include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_bootstrap.cmake) - -if(LINUX) - add_subdirectory(bootstrap_serverdaemon) -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) \ $(LIBSODIUM_LIBS) \ $(WINSOCK2_LIBS) -EXTRA_DIST += $(top_srcdir)/other/cmake/DHT_bootstrap.cmake \ - $(top_srcdir)/other/CMakeLists.txt \ - $(top_srcdir)/other/DHTservers \ +EXTRA_DIST += $(top_srcdir)/other/DHTservers \ $(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 @@ -cmake_minimum_required(VERSION 2.6.0) -project(DHT_bootstrap_daemon C) - -set(exe_name DHT_bootstrap_daemon) - -find_package(LIBCONFIG REQUIRED) - -include_directories(${LIBCONFIG_INCLUDE_DIR}) - -add_executable(${exe_name} - DHT_bootstrap_daemon.c) - -target_link_libraries(${exe_name} - ${LIBCONFIG_LIBRARY}) - -linkCoreLibraries(${exe_name}) - -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules") -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 EXTRA_DIST += \ $(top_srcdir)/other/bootstrap_serverdaemon/server.cfg \ - $(top_srcdir)/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.sh \ - $(top_srcdir)/other/bootstrap_serverdaemon/cmake/Modules \ - $(top_srcdir)/other/bootstrap_serverdaemon/cmake/Modules/FindLibConfig.cmake \ - $(top_srcdir)/other/bootstrap_serverdaemon/cmake/Modules/FindLibConfig.cmake \ - $(top_srcdir)/other/bootstrap_serverdaemon/CMakeLists.txt + $(top_srcdir)/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.sh 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 @@ -#Ref: https://github.com/schnorr/pajeng/blob/master/cmake/FindLibConfig.cmake -# -# This module defines -# LIBCONFIG_INCLUDE_DIR, where to find cppunit include files, etc. -# LIBCONFIG_LIBRARIES, the libraries to link against to use CppUnit. -# LIBCONFIG_STATIC_LIBRARIY_PATH -# LIBCONFIG_FOUND, If false, do not try to use CppUnit. - -# also defined, but not for general use are -# LIBCONFIG_LIBRARY, where to find the CUnit library. - -#MESSAGE("Searching for libconfig library") - -FIND_PATH(LIBCONFIG_INCLUDE_DIR libconfig.h - /usr/local/include - /usr/include -) - -FIND_PATH(LIBCONFIGPP_INCLUDE_DIR libconfig.h++ - /usr/local/include - /usr/include -) - -FIND_LIBRARY(LIBCONFIG_LIBRARY config - /usr/local/lib - /usr/lib -) - -FIND_LIBRARY(LIBCONFIGPP_LIBRARY config++ - /usr/local/lib - /usr/lib -) - -FIND_LIBRARY(LIBCONFIG_STATIC_LIBRARY "libconfig${CMAKE_STATIC_LIBRARY_SUFFIX}" - /usr/local/lib - /usr/lib -) - -FIND_LIBRARY(LIBCONFIGPP_STATIC_LIBRARY "libconfig++${CMAKE_STATIC_LIBRARY_SUFFIX}" - /usr/local/lib - /usr/lib -) - - -IF(LIBCONFIG_INCLUDE_DIR) - IF(LIBCONFIG_LIBRARY) - SET(LIBCONFIG_FOUND TRUE) - SET(LIBCONFIG_LIBRARIES ${LIBCONFIG_LIBRARY}) - SET(LIBCONFIG_STATIC_LIBRARY_PATH ${LIBCONFIG_STATIC_LIBRARY}) - ENDIF(LIBCONFIG_LIBRARY) -ENDIF(LIBCONFIG_INCLUDE_DIR) - -IF(LIBCONFIGPP_INCLUDE_DIR) - IF(LIBCONFIGPP_LIBRARY) - SET(LIBCONFIGPP_FOUND TRUE) - SET(LIBCONFIGPP_LIBRARIES ${LIBCONFIGPP_LIBRARY}) - SET(LIBCONFIGPP_STATIC_LIBRARY_PATH ${LIBCONFIGPP_STATIC_LIBRARY}) - ENDIF(LIBCONFIGPP_LIBRARY) -ENDIF(LIBCONFIGPP_INCLUDE_DIR) - -IF (LIBCONFIG_FOUND) - IF (NOT LibConfig_FIND_QUIETLY) - MESSAGE(STATUS "Found LibConfig++: ${LIBCONFIGPP_LIBRARIES}" ) - MESSAGE(STATUS "Found LibConfig: ${LIBCONFIG_LIBRARIES}") - MESSAGE(STATUS "static LibConfig path: ${LIBCONFIG_STATIC_LIBRARY_PATH}") - ENDIF (NOT LibConfig_FIND_QUIETLY) -ELSE (LIBCONFIG_FOUND) - IF (LibConfig_FIND_REQUIRED) - MESSAGE(SEND_ERROR "Could NOT find LibConfig") - ENDIF (LibConfig_FIND_REQUIRED) -ENDIF (LIBCONFIG_FOUND) - -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 @@ -cmake_minimum_required(VERSION 2.6.0) -project(DHT_bootstrap C) - -set(exe_name DHT_bootstrap) - -add_executable(${exe_name} - DHT_bootstrap.c - ../testing/misc_tools.c) - -linkCoreLibraries(${exe_name}) -- cgit v1.2.3