Bump version to 1.1.6

[resolv_wrapper.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac11338842e94f3d3a9bdce1ba9c257d9cb020b6..12750760b28bcceea0fc26ae7ea1005d15205d0a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,26 +1,33 @@
-project(resolv_wrapper C)
-
 # Required cmake version
-cmake_minimum_required(VERSION 2.8.0)
+cmake_minimum_required(VERSION 3.5.0)
+cmake_policy(SET CMP0048 NEW)
 
-# global needed variables
-set(APPLICATION_NAME ${PROJECT_NAME})
+# Specify search path for CMake modules to be loaded by include()
+# and find_package()
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
 
-set(APPLICATION_VERSION_MAJOR "1")
-set(APPLICATION_VERSION_MINOR "1")
-set(APPLICATION_VERSION_PATCH "0")
+# Add defaults for cmake
+# Those need to be set before the project() call.
+include(DefineCMakeDefaults)
+include(DefineCompilerFlags)
 
-set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}")
+project(resolv_wrapper VERSION 1.1.6 LANGUAGES C)
 
-# SOVERSION scheme: CURRENT.AGE.REVISION
+# global needed variables
+set(APPLICATION_NAME ${PROJECT_NAME})
+
+# SOVERSION scheme: MAJOR.MINOR.PATCH
 #   If there was an incompatible interface change:
-#     Increment CURRENT. Set AGE and REVISION to 0
+#     Increment MAJOR. Set MINOR and PATCH to 0
 #   If there was a compatible interface change:
-#     Increment AGE. Set REVISION to 0
+#     Increment MINOR. Set PATCH to 0
 #   If the source code was changed, but there were no interface changes:
-#     Increment REVISION.
-set(LIBRARY_VERSION "0.0.1")
-set(LIBRARY_SOVERSION "0")
+#     Increment PATCH.
+set(LIBRARY_VERSION_MAJOR 0)
+set(LIBRARY_VERSION_MINOR 0)
+set(LIBRARY_VERSION_PATCH 6)
+set(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}")
+set(LIBRARY_SOVERSION ${LIBRARY_VERSION_MAJOR})
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH
@@ -28,16 +35,11 @@ set(CMAKE_MODULE_PATH
 )
 
 # add definitions
-include(DefineCMakeDefaults)
 include(DefinePlatformDefaults)
-include(DefineCompilerFlags)
-include(DefineInstallationPaths)
+include(GNUInstallDirs)
 include(DefineOptions.cmake)
 include(CPackConfig.cmake)
-
-# disallow in-source build
-include(MacroEnsureOutOfSourceBuild)
-macro_ensure_out_of_source_build("${PROJECT_NAME} requires an out of source build. Please create a separate build directory and run 'cmake /path/to/${PROJECT_NAME} [options]' there.")
+include(CompilerChecks.cmake)
 
 # Find out if we have threading available
 set(CMAKE_THREAD_PREFER_PTHREADS ON)
@@ -58,7 +60,7 @@ install(
   FILES
     ${CMAKE_CURRENT_BINARY_DIR}/resolv_wrapper.pc
   DESTINATION
-    ${LIB_INSTALL_DIR}/pkgconfig
+     ${CMAKE_INSTALL_LIBDIR}/pkgconfig
   COMPONENT
     pkgconfig
 )
@@ -71,14 +73,14 @@ install(
         ${CMAKE_CURRENT_BINARY_DIR}/resolv_wrapper-config-version.cmake
         ${CMAKE_CURRENT_BINARY_DIR}/resolv_wrapper-config.cmake
     DESTINATION
-        ${CMAKE_INSTALL_DIR}/resolv_wrapper
+        ${CMAKE_INSTALL_LIBDIR}/cmake/resolv_wrapper
     COMPONENT
         devel
 )
 
 add_subdirectory(doc)
 if (UNIT_TESTING)
-    find_package(cmocka REQUIRED)
+    find_package(cmocka 1.1.0 REQUIRED)
     include(AddCMockaTest)
     add_subdirectory(tests)
 endif (UNIT_TESTING)