CMake: Check for ptsname_r() again

[apt.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90e5272c9912aad58ee5bc2c4be832697d21738c..7e432bca3932cbca1d2e4406efe20bce7809c66e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,9 @@
 
 # set minimum version
 project(apt)
-cmake_minimum_required(VERSION 3.3.0)
+cmake_minimum_required(VERSION 3.4.0)
+
+enable_testing()
 
 option(WITH_DOC "Build documentation." OFF)
 option(USE_NLS "Localisation support." ON)
@@ -17,6 +19,7 @@ endif()
 
 # Include stuff
 include(Misc)
+include(Translations)
 include(CheckIncludeFiles)
 include(CheckFunctionExists)
 include(CheckStructHasMember)
@@ -53,7 +56,7 @@ endif()
 
 
 # apt-transport-https dependencies
-pkg_check_modules(CURL libcurl REQUIRED)
+find_package(CURL REQUIRED)
 if (CURL_FOUND)
   set(HAVE_CURL 1)
 endif()
@@ -99,6 +102,7 @@ check_function_exists(getresuid HAVE_GETRESUID)
 check_function_exists(getresgid HAVE_GETRESGID)
 check_function_exists(setresuid HAVE_SETRESUID)
 check_function_exists(setresgid HAVE_SETRESGID)
+check_function_exists(ptsname_r HAVE_PTSNAME_R)
 check_function_exists(timegm HAVE_TIMEGM)
 test_big_endian(WORDS_BIGENDIAN)
 
@@ -107,12 +111,17 @@ if (CMAKE_USE_PTHREADS_INIT)
 endif()
 
 # Configure some variables like package, version and architecture.
-set(PACKAGE "apt")
+set(PACKAGE ${PROJECT_NAME})
+set(PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>")
 
-execute_process(COMMAND dpkg-parsechangelog -SVersion -l${PROJECT_SOURCE_DIR}/debian/changelog
-                OUTPUT_VARIABLE PACKAGE_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND dpkg-architecture -qDEB_HOST_ARCH
-                OUTPUT_VARIABLE COMMON_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+if (NOT DEFINED PACKAGE_VERSION)
+  execute_process(COMMAND dpkg-parsechangelog -SVersion -l${PROJECT_SOURCE_DIR}/debian/changelog
+                  OUTPUT_VARIABLE PACKAGE_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif()
+if (NOT DEFINED COMMON_ARCH)
+  execute_process(COMMAND dpkg-architecture -qDEB_HOST_ARCH
+                  OUTPUT_VARIABLE COMMON_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif()
 
 # Configure our configuration headers (config.h and apti18n.h)
 configure_file(CMake/config.h.in ${PROJECT_BINARY_DIR}/include/config.h)
@@ -127,6 +136,9 @@ add_subdirectory(apt-pkg)
 add_subdirectory(apt-private)
 add_subdirectory(apt-inst)
 add_subdirectory(cmdline)
+add_subdirectory(doc)
 add_subdirectory(dselect)
 add_subdirectory(ftparchive)
 add_subdirectory(methods)
+add_subdirectory(po)
+add_subdirectory(test)