tests: don't do boundless string compares with data()

[apt.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index defb4f1112c20b755f99b222786ef4b625c4806a..3263bea82ff4a0b88e9853bff5aa3725a791b62c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,9 +3,11 @@
 
 # set minimum version
 project(apt)
 
 # set minimum version
 project(apt)

-cmake_minimum_required(VERSION 3.3.0)
+cmake_minimum_required(VERSION 3.4.0)

 
 

-option(WITH_DOC "Build documentation." OFF)
+enable_testing()
+
+option(WITH_DOC "Build documentation." ON)

 option(USE_NLS "Localisation support." ON)
 
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMake")
 option(USE_NLS "Localisation support." ON)
 
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMake")


@@ -54,7 +56,7 @@ endif()
 
 
 # apt-transport-https dependencies
 
 
 # apt-transport-https dependencies

-pkg_check_modules(CURL libcurl REQUIRED)
+find_package(CURL REQUIRED)

 if (CURL_FOUND)
   set(HAVE_CURL 1)
 endif()
 if (CURL_FOUND)
   set(HAVE_CURL 1)
 endif()


@@ -90,7 +92,7 @@ if (NOT HAVE_STATVFS)
   if (NOT HAVE_VFS_H AND NOT HAVE_MOUNT_H)
     message(FATAL_ERROR "Can find neither statvfs() nor statfs()")
   endif()
   if (NOT HAVE_VFS_H AND NOT HAVE_MOUNT_H)
     message(FATAL_ERROR "Can find neither statvfs() nor statfs()")
   endif()

-  configure_file(buildlib/statvfs.h.in ${PROJECT_BINARY_DIR}/include/statvfs.h @ONLY)
+  configure_file(CMake/statvfs.h.in ${PROJECT_BINARY_DIR}/include/statvfs.h COPYONLY)

 endif()
 
 CHECK_STRUCT_HAS_MEMBER("struct statfs" f_type sys/vfs.h HAVE_STRUCT_STATFS_F_TYPE)
 endif()
 
 CHECK_STRUCT_HAS_MEMBER("struct statfs" f_type sys/vfs.h HAVE_STRUCT_STATFS_F_TYPE)


@@ -100,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(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)
 
 check_function_exists(timegm HAVE_TIMEGM)
 test_big_endian(WORDS_BIGENDIAN)
 


@@ -108,12 +111,14 @@ if (CMAKE_USE_PTHREADS_INIT)
 endif()
 
 # Configure some variables like package, version and architecture.
 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>")
+set(PACKAGE_VERSION "1.3~rc1")

 
 

-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 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)
 
 # Configure our configuration headers (config.h and apti18n.h)
 configure_file(CMake/config.h.in ${PROJECT_BINARY_DIR}/include/config.h)


@@ -133,3 +138,7 @@ add_subdirectory(dselect)
 add_subdirectory(ftparchive)
 add_subdirectory(methods)
 add_subdirectory(po)
 add_subdirectory(ftparchive)
 add_subdirectory(methods)
 add_subdirectory(po)

+add_subdirectory(test)
+
+# Link update-po4a into the update-po target
+add_dependencies(update-po update-po4a)