diff --git a/.gitignore b/.gitignore index 1e1685c0d02ae0868fdbde789bd02cdb9ecbf88a..5a9e61f2debeaf47e476cbd2830a6d91d4b13a44 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,7 @@ Makefile.in *.l[ao] *~ *.pc + +# KDevelop +.kdev4/ +*.kdev4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d0d17bad32def0837666bcd6f6ff90a27f43c2b..47acc8980c8763a511d6390fd05114abed2f2a63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,10 +16,10 @@ option (OPENDHT_PYTHON "Build Python bindings" OFF) option (OPENDHT_TOOLS "Build DHT tools" ON) option (OPENDHT_DEBUG "Build with debug flags" OFF) -set (CMAKE_CXX_FLAGS "-std=c++11 -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor ${CMAKE_CXX_FLAGS}") +set (CMAKE_CXX_FLAGS "-pthread -std=c++11 -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor ${CMAKE_CXX_FLAGS}") find_package (GnuTLS 3.1 REQUIRED) -find_package (Msgpack 1.1 REQUIRED) +find_package (Msgpack 1.2 REQUIRED) if (OPENDHT_TOOLS) find_package (Readline 6 REQUIRED) endif () diff --git a/Makefile.am b/Makefile.am index e764ea6dcc704d8fb795513dc13438217326b950..eeb24dd007667a467b7594ecc9ba0606ff301878 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +AM_CXXFLAGS = -pthread + SUBDIRS = src if ENABLE_TOOLS diff --git a/configure.ac b/configure.ac index af8d2e4d6cd799b0cef1a9a083a7870bc0c0bb4d..95824d193a0ea66c475860e5c2596228f61894c1 100644 --- a/configure.ac +++ b/configure.ac @@ -74,7 +74,7 @@ AX_CXX_COMPILE_STDCXX_11([noext],[mandatory]) PKG_PROG_PKG_CONFIG() PKG_CHECK_MODULES([nettle], [nettle >= 2.4]) PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.1]) -PKG_CHECK_MODULES([msgpack], [msgpack >= 1.1]) +PKG_CHECK_MODULES([msgpack], [msgpack >= 1.2]) AC_ARG_ENABLE([tools], AS_HELP_STRING([--disable-tools],[Disable tools (CLI DHT node)]),,build_tools=yes) AM_CONDITIONAL(ENABLE_TOOLS, test x$build_tools == xyes)