Replace inet_aton() with inet_pton() to parse IPs correctly (#8825)

[libi2ncommon] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f50f010..8c0eac7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,10 @@
+cmake_minimum_required(VERSION 3.28 FATAL_ERROR)
+
 # Project
 project(libi2ncommon)
 
 # Version settings
-set(VERSION 2.9)
+set(VERSION 2.12)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
 
@@ -11,7 +13,6 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "")
    set(CMAKE_BUILD_TYPE     Debug)
 endif("${CMAKE_BUILD_TYPE}" STREQUAL "")
 set(CMAKE_COLOR_MAKEFILE ON)
-cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
 
 # Debug build
 message("-- Build type: ${CMAKE_BUILD_TYPE}")
@@ -135,6 +136,11 @@ include(FindPkgConfig)
 # Find Boost
 find_package(Boost 1.44 COMPONENTS iostreams unit_test_framework thread REQUIRED)
 
+# Find pcrecpp
+pkg_check_modules(PCRECPP REQUIRED libpcrecpp)
+INCLUDE_DIRECTORIES(${PCRECPP_INCLUDE_DIRS})
+LINK_DIRECTORIES(${PCRECPP_LIBRARY_DIRS})
+
 # Find libxml++
 if (BUILD_XMLLIB)
     pkg_check_modules(XMLPP REQUIRED libxml++-2.6)
@@ -147,6 +153,11 @@ if (IMAP_UTF7_SUPPORT)
     link_directories(${ICONV_LIBRARY_DIRS})
 endif(IMAP_UTF7_SUPPORT)
 
+# Detect openssl - for base64 routines
+pkg_check_modules(OPENSSL REQUIRED openssl)
+INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIRS})
+LINK_DIRECTORIES(${OPENSSL_LIBRARY_DIRS})
+
 # pkgconfig output
 set(prefix      ${CMAKE_INSTALL_PREFIX})
 set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)