Merge pull request #27 from justusranvier/cmake

Minor cmake fixes

.gitignore

@@ -41,3 +41,7 @@ Makefile.in
 *.l[ao]
 *~
 *.pc
+
+# KDevelop
+.kdev4/
+*.kdev4

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 ()

Makefile.am

+AM_CXXFLAGS = -pthread
+
 SUBDIRS = src
 
 if ENABLE_TOOLS

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)