Update CMakeLists.txt to build with current source files

- Add missing ipset_dns.c/h and ipset6_dns.c/h
- Link pthreads properly via Threads::Threads
- Generate config.h from cmake/config.h.in template
- Check for __uint128_t at configure time
- Enable COMPARE_WITH_COMMON and compiler warnings
- Fix target name to 'iprange' (was 'iprange_git')

Author: ktsaou

CMakeLists.txt

@@ -1,33 +1,65 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.10)
 project(iprange C)
 
-find_package (Threads)
+find_package(Threads REQUIRED)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat-signedness -Werror=format-security")
+include(CheckTypeSize)
+check_type_size("__uint128_t" UINT128_SIZE LANGUAGE C)
+if(NOT HAVE_UINT128_SIZE)
+    message(FATAL_ERROR "Compiler does not support __uint128_t, required for IPv6")
+endif()
 
-set(SOURCE_FILES
-        src/iprange.c src/iprange.h src/iprange6.h src/iprange6_main.c
-        src/ipset.c src/ipset.h
-        src/ipset6.c src/ipset6.h
-        src/ipset6_binary.c src/ipset6_binary.h
-        src/ipset6_combine.c src/ipset6_common.c src/ipset6_copy.c
-        src/ipset6_diff.c src/ipset6_exclude.c
-        src/ipset6_load.c src/ipset6_load.h
-        src/ipset6_merge.c src/ipset6_optimize.c
-        src/ipset6_print.c src/ipset6_print.h
-        src/ipset_binary.c src/ipset_binary.h
-        src/ipset_combine.c src/ipset_combine.h
-        src/ipset_common.c src/ipset_common.h
-        src/ipset_copy.c src/ipset_copy.h
-        src/ipset_diff.c src/ipset_diff.h
-        src/ipset_exclude.c src/ipset_exclude.h
-        src/ipset_load.c src/ipset_load.h
-        src/ipset_merge.c src/ipset_merge.h
-        src/ipset_optimize.c src/ipset_optimize.h
-        src/ipset_print.c src/ipset_print.h
-        src/ipset_reduce.c src/ipset_reduce.h)
+# Generate config.h with the defines the source expects
+include(CheckIncludeFile)
+check_include_file(inttypes.h HAVE_INTTYPES_H)
+check_include_file(stdint.h HAVE_STDINT_H)
 
-include_directories(AFTER ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src)
-add_definitions("-DHAVE_CONFIG_H")
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/config.h
+)
 
-add_executable(iprange_git ${SOURCE_FILES})
+set(SOURCES
+    src/iprange.c
+    src/iprange6_main.c
+    src/ipset.c
+    src/ipset6.c
+    src/ipset6_binary.c
+    src/ipset6_combine.c
+    src/ipset6_common.c
+    src/ipset6_copy.c
+    src/ipset6_diff.c
+    src/ipset6_dns.c
+    src/ipset6_exclude.c
+    src/ipset6_load.c
+    src/ipset6_merge.c
+    src/ipset6_optimize.c
+    src/ipset6_print.c
+    src/ipset_binary.c
+    src/ipset_combine.c
+    src/ipset_common.c
+    src/ipset_copy.c
+    src/ipset_diff.c
+    src/ipset_dns.c
+    src/ipset_exclude.c
+    src/ipset_load.c
+    src/ipset_merge.c
+    src/ipset_optimize.c
+    src/ipset_print.c
+    src/ipset_reduce.c
+)
+
+add_executable(iprange ${SOURCES})
+target_include_directories(iprange PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
+)
+target_compile_definitions(iprange PRIVATE
+    HAVE_CONFIG_H
+    COMPARE_WITH_COMMON=1
+    VERSION="${PROJECT_VERSION}"
+)
+target_compile_options(iprange PRIVATE
+    -Wall -Wextra -Wformat-signedness -Werror=format-security
+)
+target_link_libraries(iprange Threads::Threads)

cmake/config.h.in

@@ -0,0 +1,13 @@
+/* config.h.in — generated by CMake */
+
+#cmakedefine HAVE_INTTYPES_H 1
+#cmakedefine HAVE_STDINT_H 1
+
+/* gcc branch optimization */
+#ifdef __GNUC__
+#define likely(x)   __builtin_expect(!!(x), 1)
+#define unlikely(x) __builtin_expect(!!(x), 0)
+#else
+#define likely(x)   (x)
+#define unlikely(x) (x)
+#endif