Bump minimum CMake version and termo

And some related cleanup or unification.

5 files changed, 35 insertions, 44 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb253b7..6750eb9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,35 +1,29 @@
-project (ponymap C)
-cmake_minimum_required (VERSION 2.8.5)
+cmake_minimum_required (VERSION 3.0)
+project (ponymap VERSION 0.1.0 LANGUAGES C)
 
 # Moar warnings
 if ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
 	# -Wunused-function is pretty annoying here, as everything is static
 	set (CMAKE_C_FLAGS
 		"${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -Wno-unused-function")
-endif ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
-
-# Version
-set (project_VERSION_MAJOR "0")
-set (project_VERSION_MINOR "1")
-set (project_VERSION_PATCH "0")
-
-set (project_VERSION "${project_VERSION_MAJOR}")
-set (project_VERSION "${project_VERSION}.${project_VERSION_MINOR}")
-set (project_VERSION "${project_VERSION}.${project_VERSION_PATCH}")
-
-if ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD")
-	# Need this in FreeBSD and OpenBSD respectively;
-	# our POSIX version macros make it undefined
-	add_definitions (-D__BSD_VISIBLE=1 -D_BSD_SOURCE=1)
-endif ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD")
+endif ()
 
 # Dependencies
+set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/liberty/cmake)
+include (AddThreads)
+
 find_package (Curses)
 find_package (PkgConfig REQUIRED)
 pkg_check_modules (jansson REQUIRED jansson)
 pkg_check_modules (libssl REQUIRED libssl libcrypto)
 pkg_check_modules (ncursesw ncursesw)
 
+if ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD")
+	# Need this in FreeBSD and OpenBSD respectively;
+	# our POSIX version macros make it undefined
+	add_definitions (-D__BSD_VISIBLE=1 -D_BSD_SOURCE=1)
+endif ()
+
 if (ncursesw_FOUND)
 	set (project_libraries ${ncursesw_LIBRARIES})
 	include_directories (${ncursesw_INCLUDE_DIRS})
@@ -37,9 +31,9 @@ if (ncursesw_FOUND)
 elseif (CURSES_FOUND)
 	set (project_libraries ${CURSES_LIBRARY})
 	include_directories (${CURSES_INCLUDE_DIR})
-else (CURSES_FOUND)
+else ()
 	message (SEND_ERROR "Curses not found")
-endif (ncursesw_FOUND)
+endif ()
 
 # FIXME: for "lua" we also need to check that it is < 5.5
 #   which doesn't seem to be possible with FindPkgConfig
@@ -49,26 +43,25 @@ option (WITH_LUA "Enable experimental support for Lua plugins" ${lua_FOUND})
 if (WITH_LUA)
 	if (NOT lua_FOUND)
 		message (FATAL_ERROR "Lua library not found")
-	endif (NOT lua_FOUND)
+	endif ()
 
 	list (APPEND project_libraries ${lua_LIBRARIES})
 	include_directories (${lua_INCLUDE_DIRS})
 	link_directories (${lua_LIBRARY_DIRS})
-endif (WITH_LUA)
+endif ()
 
 list (APPEND project_libraries ${libssl_LIBRARIES} ${jansson_LIBRARIES})
 include_directories (${libssl_INCLUDE_DIRS} ${jansson_INCLUDE_DIRS})
 link_directories (${libssl_LIBRARY_DIRS} ${jansson_LIBRARY_DIRS})
 
-# -lpthread is only there for debugging (gdb & errno)
 # -lrt is only for glibc < 2.17
 # -liconv may or may not be a part of libc
-foreach (extra iconv dl rt pthread)
+foreach (extra iconv dl rt)
 	find_library (extra_lib_${extra} ${extra})
 	if (extra_lib_${extra})
 		list (APPEND project_libraries ${extra})
-	endif (extra_lib_${extra})
-endforeach (extra)
+	endif ()
+endforeach ()
 
 # Project source files
 set (project_sources ${PROJECT_NAME}.c)
@@ -83,6 +76,7 @@ include_directories (${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
 # Build and install the main executable
 add_executable (${PROJECT_NAME} ${project_sources} ${project_headers})
 target_link_libraries (${PROJECT_NAME} ${project_libraries})
+add_threads (${PROJECT_NAME})
 
 install (TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
 install (FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
@@ -91,6 +85,7 @@ install (FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
 add_library (plugin-http SHARED plugins/http.c plugin-api.h
 	http-parser/http_parser.c http-parser/http_parser.h)
 target_link_libraries (plugin-http ${project_libraries})
+add_threads (plugin-http)
 set_target_properties (plugin-http PROPERTIES OUTPUT_NAME http PREFIX "")
 install (TARGETS plugin-http DESTINATION ${plugin_dir})
 
@@ -102,21 +97,22 @@ if (WITH_LUA)
 	list (APPEND plugins lua-loader)
 	foreach (lua_plugin ${lua_plugins})
 		install (FILES plugins/${lua_plugin}.lua DESTINATION ${plugin_dir})
-	endforeach (lua_plugin)
-endif (WITH_LUA)
+	endforeach ()
+endif ()
 foreach (plugin ${plugins})
 	set (target plugin-${plugin})
 	add_library (${target} SHARED plugins/${plugin}.c plugin-api.h)
 	target_link_libraries (${target} ${project_libraries})
+	add_threads (${target})
 	set_target_properties (${target} PROPERTIES OUTPUT_NAME ${plugin} PREFIX "")
 	install (TARGETS ${target} DESTINATION ${plugin_dir})
-endforeach (plugin)
+endforeach ()
 
 # Generate documentation from program help
 find_program (HELP2MAN_EXECUTABLE help2man)
 if (NOT HELP2MAN_EXECUTABLE)
 	message (FATAL_ERROR "help2man not found")
-endif (NOT HELP2MAN_EXECUTABLE)
+endif ()
 
 foreach (page ${PROJECT_NAME})
 	set (page_output "${PROJECT_BINARY_DIR}/${page}.1")
@@ -126,7 +122,7 @@ foreach (page ${PROJECT_NAME})
 			"${PROJECT_BINARY_DIR}/${page}" -o ${page_output}
 		DEPENDS ${page}
 		COMMENT "Generating man page for ${page}" VERBATIM)
-endforeach (page)
+endforeach ()
 
 add_custom_target (docs ALL DEPENDS ${project_MAN_PAGES})
 
@@ -134,23 +130,22 @@ foreach (page ${project_MAN_PAGES})
 	string (REGEX MATCH "\\.([0-9])$" manpage_suffix "${page}")
 	install (FILES "${page}"
 		DESTINATION "${CMAKE_INSTALL_MANDIR}/man${CMAKE_MATCH_1}")
-endforeach (page)
+endforeach ()
 
 # CPack
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Experimental network scanner")
-set (CPACK_PACKAGE_VERSION ${project_VERSION})
 set (CPACK_PACKAGE_VENDOR "Premysl Eric Janouch")
 set (CPACK_PACKAGE_CONTACT "Přemysl Eric Janouch <p@janouch.name>")
 set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 
 set (CPACK_GENERATOR "TGZ;ZIP")
 set (CPACK_PACKAGE_FILE_NAME
-	"${PROJECT_NAME}-${project_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
-set (CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}-${project_VERSION}")
+	"${PROJECT_NAME}-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
+set (CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}-${PROJECT_VERSION}")
 
 set (CPACK_SOURCE_GENERATOR "TGZ;ZIP")
 set (CPACK_SOURCE_IGNORE_FILES "/\\\\.git;/build;/CMakeLists.txt.user")
-set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${project_VERSION}")
+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}")
 
 set (CPACK_SET_DESTDIR TRUE)
 include (CPack)
diff --git a/README.adoc b/README.adoc
index 6e05524..3a790ae 100644
--- a/README.adoc
+++ b/README.adoc
@@ -22,7 +22,7 @@ a package with the latest development version from Archlinux's AUR.
 
 Building and Usage
 ------------------
-Build dependencies: CMake, pkg-config, help2man +
+Build dependencies: CMake >= 3.0, pkg-config, help2man +
 Runtime dependenices: curses, openssl, Jansson, lua >= 5.3 (optional)
 
  $ git clone --recursive https://git.janouch.name/p/ponymap.git
@@ -40,9 +40,6 @@ Or you can try telling CMake to make a package for you.  For Debian it is:
  $ cpack -G DEB
  # dpkg -i ponymap-*.deb
 
-Note that for versions of CMake before 2.8.9, you need to prefix `cpack` with
-`fakeroot` or file ownership will end up wrong.
-
 Having the program installed, simply run it with no arguments to retrieve
 a usage text.  Have fun scanning.
 
diff --git a/config.h.in b/config.h.in
index 6c3bbfe..d35dfe2 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,8 +1,8 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#define PROGRAM_NAME "${CMAKE_PROJECT_NAME}"
-#define PROGRAM_VERSION "${project_VERSION}"
+#define PROGRAM_NAME "${PROJECT_NAME}"
+#define PROGRAM_VERSION "${PROJECT_VERSION}"
 
 #cmakedefine WITH_LUA
 #define PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/${plugin_dir}"
diff --git a/liberty b/liberty
-Subproject 1a76b2032e6d18d9f95d9d0bb98edc26023c861
+Subproject d71c47f8ce7aecdc4856630e9d73a48912be68c
diff --git a/ponymap.c b/ponymap.c
index 913d16e..f8c0ac4 100644
--- a/ponymap.c
+++ b/ponymap.c
@@ -470,8 +470,7 @@ indicator_set_status (struct indicator *self, char *status)
 	bool refresh = self->shown;
 	indicator_hide (self);
 
-	free (self->status);
-	self->status = status;
+	cstr_set (&self->status, status);
 
 	if (refresh)
 		indicator_show (self);