Upgrade required cmake version to 3.15 (refs #357)

Author: scheibel

.ignore

@@ -4,7 +4,7 @@
 # 
 
 # CMake version
-cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 
 
 #
@@ -28,33 +28,56 @@ endif()
 include(cmake/Custom.cmake)
 
 # Set policies
-set_policy(CMP0054 NEW) # ENABLE CMP0054: Only interpret if() arguments as variables or keywords when unquoted.
-set_policy(CMP0042 NEW) # ENABLE CMP0042: MACOSX_RPATH is enabled by default.
-set_policy(CMP0063 NEW) # ENABLE CMP0063: Honor visibility properties for all target types.
-set_policy(CMP0069 NEW) # ENABLE CMP0069: INTERPROCEDURAL_OPTIMIZATION is enforced when enabled.
-set_policy(CMP0072 NEW) # ENABLE CMP0072: FindOpenGL prefers GLVND by default when available.
-set_policy(CMP0077 NEW) # ENABLE CMP0077: option() honors normal variables.
+set_policy(CMP0054 NEW) # ENABLE  CMP0054: Only interpret if() arguments as variables or keywords when unquoted.
+set_policy(CMP0042 NEW) # ENABLE  CMP0042: MACOSX_RPATH is enabled by default.
+set_policy(CMP0063 NEW) # ENABLE  CMP0063: Honor visibility properties for all target types.
+set_policy(CMP0069 NEW) # ENABLE  CMP0069: INTERPROCEDURAL_OPTIMIZATION is enforced when enabled.
+set_policy(CMP0072 NEW) # ENABLE  CMP0072: FindOpenGL prefers GLVND by default when available.
+set_policy(CMP0077 NEW) # ENABLE  CMP0077: option() honors normal variables.
+set_policy(CMP0120 OLD) # DISABLE CMP0120: The WriteCompilerDetectionHeader module is removed.
 
 # Include cmake modules
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 include(GenerateExportHeader)
-
-set(WriterCompilerDetectionHeaderFound NOTFOUND)
-# This module is only available with CMake >=3.1, so check whether it could be found
-# BUT in CMake 3.1 this module doesn't recognize AppleClang as compiler, so just use it as of CMake 3.2
-if (${CMAKE_VERSION} VERSION_GREATER "3.2")
-    include(WriteCompilerDetectionHeader OPTIONAL RESULT_VARIABLE WriterCompilerDetectionHeaderFound)
-endif()
-
-if (${CMAKE_VERSION} VERSION_GREATER "3.9")
-    include(CheckIPOSupported OPTIONAL RESULT_VARIABLE CheckIPOSupportedFound)
-endif()
+include(WriteCompilerDetectionHeader)
+include(CheckIPOSupported OPTIONAL RESULT_VARIABLE CheckIPOSupportedFound)
 
 # Include custom cmake modules
+include(cmake/Coverage.cmake)
+include(cmake/GenerateTemplateExportHeader.cmake)
 include(cmake/GetGitRevisionDescription.cmake)
 include(cmake/HealthCheck.cmake)
-include(cmake/GenerateTemplateExportHeader.cmake)
+
+# 
+# Project configuration options
+# 
+
+# Project options
+option(BUILD_SHARED_LIBS              "Build shared instead of static libraries."                 ON)
+option(OPTION_SELF_CONTAINED          "Create a self-contained install with all dependencies."    OFF)
+option(OPTION_BUILD_TESTS             "Build tests."                                              OFF)
+option(OPTION_BUILD_DOCS              "Build documentation."                                      OFF)
+option(OPTION_BUILD_TOOLS             "Build tools."                                              ON)
+option(OPTION_BUILD_EXAMPLES          "Build examples."                                           ON)
+option(OPTION_BUILD_WITH_BOOST_THREAD "Use boost::thread instead of std::thread."                 OFF)
+option(OPTION_BUILD_CHECK             "Enable source code check targets"                          OFF)
+option(OPTION_BUILD_OWN_KHR_HEADERS   "Build and deploy glbinding with in-source KHR headers."    OFF)
+option(OPTION_BUILD_WITH_LTO          "Build with Link-time Optimization (may break AppleClang)"  OFF)
+option(OPTION_USE_GIT_INFORMATION     "Fetches commit information from the git source repository" ON)
+option(OPTION_ENABLE_COVERAGE         "Add coverage information."                                 OFF)
+
+# Get git revision
+if (OPTION_USE_GIT_INFORMATION AND GLBINDING_BUILD_AS_ROOT)
+  get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+  string(SUBSTRING "${GIT_SHA1}" 0 12 GIT_REV)
+  if(NOT GIT_SHA1)
+      set(GIT_REV "0")
+  endif()
+else()
+  set(GIT_SHA1 "")
+  set(GIT_REV "0")
+endif()
 
 
 # 
@@ -68,33 +91,17 @@ set(META_AUTHOR_ORGANIZATION "CG Internals GmbH")
 set(META_AUTHOR_DOMAIN       "https://github.com/cginternals/glbinding/")
 set(META_AUTHOR_MAINTAINER   "[email protected]")
 set(META_VERSION_MAJOR       "3")
-set(META_VERSION_MINOR       "4")
+set(META_VERSION_MINOR       "5")
 set(META_VERSION_PATCH       "0")
 set(META_VERSION_REVISION    "${GIT_REV}")
 set(META_VERSION             "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}")
 set(META_NAME_VERSION        "${META_PROJECT_NAME} v${META_VERSION} (${META_VERSION_REVISION})")
-set(META_CMAKE_INIT_SHA      "c472829f01df4c99c7bd3fa96bcf6854b3dd44f1")
+set(META_CMAKE_INIT_SHA      "1915e8c3eb77bc67c14de7ced94f0623e889416a")
+set(META_CMAKE_INIT_BRANCH   "cmake-3.15")
 
 string(MAKE_C_IDENTIFIER ${META_PROJECT_NAME} META_PROJECT_ID)
 string(TOUPPER ${META_PROJECT_ID} META_PROJECT_ID)
 
-# 
-# Project configuration options
-# 
-
-# Project options
-option(BUILD_SHARED_LIBS              "Build shared instead of static libraries."                 ON)
-option(OPTION_SELF_CONTAINED          "Create a self-contained install with all dependencies."    OFF)
-option(OPTION_BUILD_TESTS             "Build tests."                                              OFF)
-option(OPTION_BUILD_DOCS              "Build documentation."                                      OFF)
-option(OPTION_BUILD_TOOLS             "Build tools."                                              ON)
-option(OPTION_BUILD_EXAMPLES          "Build examples."                                           ON)
-option(OPTION_BUILD_WITH_BOOST_THREAD "Use boost::thread instead of std::thread."                 OFF)
-option(OPTION_BUILD_CHECK             "Enable source code check targets"                          OFF)
-option(OPTION_BUILD_OWN_KHR_HEADERS   "Build and deploy glbinding with in-source KHR headers."    OFF)
-option(OPTION_BUILD_WITH_LTO          "Build with Link-time Optimization (may break AppleClang)"  OFF)
-option(OPTION_USE_GIT_INFORMATION     "Fetches commit information from the git source repository" ON)
-
 
 # 
 # Declare project
@@ -105,19 +112,13 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set(IDE_FOLDER "")
 
 # Declare project
-project(${META_PROJECT_NAME} C CXX)
+project(${META_PROJECT_NAME}
+    VERSION ${META_VERSION}
+    DESCRIPTION ${META_PROJECT_DESCRIPTION}
+)
 
-# Get git revision
-if (OPTION_USE_GIT_INFORMATION AND GLBINDING_BUILD_AS_ROOT)
-  get_git_head_revision(GIT_REFSPEC GIT_SHA1)
-  string(SUBSTRING "${GIT_SHA1}" 0 12 GIT_REV)
-  if(NOT GIT_SHA1)
-      set(GIT_REV "0")
-  endif()
-else()
-  set(GIT_SHA1 "")
-  set(GIT_REV "0")
-endif()
+enable_language(C)
+enable_language(CXX)
 
 # Set output directories
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
@@ -128,25 +129,24 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
 file(WRITE "${PROJECT_BINARY_DIR}/VERSION" "${META_NAME_VERSION}")
 
 
-# 
-# Compiler settings and options
-# 
-
-include(cmake/CompileOptions.cmake)
-
-
 #
 # Project Health Check Setup
 #
 
 # Add cmake-init template check cmake targets
-add_check_template_target(${META_CMAKE_INIT_SHA})
+add_check_template_target(${META_CMAKE_INIT_SHA} ${META_CMAKE_INIT_BRANCH})
 
 # Configure health check tools
-if(OPTION_BUILD_CHECK)
-    enable_cppcheck(On)
-    enable_clang_tidy(On)
-endif()
+enable_cppcheck(ON)
+enable_clang_tidy(ON)
+enable_coverage(${OPTION_ENABLE_COVERAGE})
+
+
+# 
+# Compiler settings and options
+# 
+
+include(cmake/CompileOptions.cmake)
 
 
 # 

CMakeLists.txt

@@ -2,8 +2,9 @@ version: '{build}'
 branches:
   only:
   - master
-clone_folder: c:\projects\glbinding
+clone_folder: c:\projects\cmake-init
 image:
+- Visual Studio 2015
 - Visual Studio 2017
 - Visual Studio 2019
 configuration:
@@ -21,19 +22,20 @@ matrix:
 # skip unsupported combinations
 init:
 - set arch=
-- if "%arch%"=="Win64" ( set arch= Win64)
+- if "%arch%"=="Win64" ( set arch= x64)
 - echo %arch%
 - echo %APPVEYOR_BUILD_WORKER_IMAGE%
+- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( set generator="Visual Studio 15 2017" )
+- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" ( set generator="Visual Studio 14 2015" )
 - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" ( set generator="Visual Studio 16 2019" )
-- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( set generator="Visual Studio 15 2017%arch%" )
 - echo %generator%
 
 before_build:
 - cmd: |-
     mkdir build
     cd build
     cmake --version
-    cmake .. -G %generator%
+    cmake .. -G %generator%  -A %arch%
 
 build:
   project: c:\projects\glbinding\build\glbinding.sln

appveyor.yml

@@ -3,8 +3,12 @@
 # Get cmake-init latest commit SHA on master
 #
 
+if(NOT APPLIED_CMAKE_INIT_BRANCH)
+    set(APPLIED_CMAKE_INIT_BRANCH "master")
+endif ()
+
 file(DOWNLOAD
-    "https://api.github.com/repos/cginternals/cmake-init/commits/master"
+    "https://api.github.com/repos/cginternals/cmake-init/commits/${APPLIED_CMAKE_INIT_BRANCH}"
     "${PROJECT_BINARY_DIR}/cmake-init.github.data"
 )
 file(READ
@@ -45,5 +49,5 @@ endif()
 if(${APPLIED_CMAKE_INIT_SHA} STREQUAL ${CMAKE_INIT_SHA})
     message(STATUS "cmake-init template is up-to-date (${CMAKE_INIT_SHA})")
 else()
-    message(STATUS "cmake-init template needs an update https://github.com/cginternals/cmake-init/compare/${APPLIED_CMAKE_INIT_SHA}...master")
+    message(STATUS "cmake-init template needs an update https://github.com/cginternals/cmake-init/compare/${APPLIED_CMAKE_INIT_SHA}...${APPLIED_CMAKE_INIT_BRANCH}")
 endif()

cmake/CheckTemplate.cmake

@@ -19,7 +19,7 @@ endif()
 
 set(DEFAULT_PROJECT_OPTIONS
     DEBUG_POSTFIX             "d"
-    CXX_STANDARD              11 # Not available before CMake 3.1; see below for manual command line argument addition
+    CXX_STANDARD              11
     LINKER_LANGUAGE           "CXX"
     POSITION_INDEPENDENT_CODE ON
     CXX_VISIBILITY_PRESET     "hidden"
@@ -71,7 +71,7 @@ set(DEFAULT_COMPILE_OPTIONS_PRIVATE)
 set(DEFAULT_COMPILE_OPTIONS_PUBLIC)
 
 # MSVC compiler options
-if (MSVC)
+if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")
     set(DEFAULT_COMPILE_OPTIONS_PRIVATE ${DEFAULT_COMPILE_OPTIONS_PRIVATE}
         $<$<CXX_COMPILER_ID:MSVC>:
             /MP           # -> build with multiple processes
@@ -145,16 +145,17 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCH
 
             # -Wreturn-stack-address # gives false positives
         >
+
+        $<$<BOOL:${OPTION_COVERAGE_ENABLED}>:
+            -fprofile-arcs
+            -ftest-coverage
+        >
+        
     )
     set(DEFAULT_COMPILE_OPTIONS_PUBLIC ${DEFAULT_COMPILE_OPTIONS_PUBLIC}
         $<$<PLATFORM_ID:Darwin>:
             -pthread
         >
-        
-        # Required for CMake < 3.1; should be removed if minimum required CMake version is raised.
-        $<$<VERSION_LESS:${CMAKE_VERSION},3.1>:
-            -std=c++11
-        >
     )
 endif ()
 
@@ -166,10 +167,18 @@ set(DEFAULT_LINKER_OPTIONS)
 
 # Use pthreads on mingw and linux
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
-    set(DEFAULT_LINKER_OPTIONS
+    set(DEFAULT_LINKER_OPTIONS ${DEFAULT_LINKER_OPTIONS}
     PUBLIC
         -pthread
     )
+
+    if (${OPTION_COVERAGE_ENABLED})
+        set(DEFAULT_LINKER_OPTIONS ${DEFAULT_LINKER_OPTIONS}
+            PUBLIC
+                -fprofile-arcs
+                -ftest-coverage
+        )
+    endif ()
 endif()
 
 if(NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")

cmake/CompileOptions.cmake

@@ -0,0 +1,51 @@
+
+include(${CMAKE_CURRENT_LIST_DIR}/Gcov.cmake)
+
+set(OPTION_COVERAGE_ENABLED OFF)
+
+set(LCOV_EXCLUDE_COVERAGE
+    ${LCOV_EXCLUDE_COVERAGE}
+    "\"*/googletest/*\""
+    "\"*v1*\""
+    "\"/usr/*\""
+)
+
+# Function to register a target for enabled coverage report
+function(generate_coverage_report target)
+    if(NOT TARGET coverage)
+        add_custom_target(coverage)
+    
+        set_target_properties(coverage
+            PROPERTIES
+            FOLDER "Maintenance"
+            EXCLUDE_FROM_DEFAULT_BUILD 1
+        )
+    endif()
+    
+    if (${OPTION_COVERAGE_ENABLED})
+        generate_lcov_report(coverage-${target} ${target} ${ARGN})
+        add_dependencies(coverage coverage-${target})
+    endif()
+endfunction()
+
+# Enable or disable coverage
+function(enable_coverage status)
+    if(NOT ${status})
+        set(OPTION_COVERAGE_ENABLED ${status} PARENT_SCOPE)
+        message(STATUS "Coverage lcov skipped: Manually disabled")
+        
+        return()
+    endif()
+    
+    find_package(lcov)
+    
+    if(NOT lcov_FOUND)
+        set(OPTION_COVERAGE_ENABLED OFF PARENT_SCOPE)
+        message(STATUS "Coverage lcov skipped: lcov not found")
+        
+        return()
+    endif()
+    
+    set(OPTION_COVERAGE_ENABLED ${status} PARENT_SCOPE)
+    message(STATUS "Coverage report enabled")
+endfunction()

cmake/Coverage.cmake

@@ -24,7 +24,7 @@ function(source_group_by_path PARENT_PATH REGEX GROUP)
 
         string(REPLACE "/" "\\" FILEPATH "${FILEPATH}")
 
-    source_group("${GROUP}\\${FILEPATH}" REGULAR_EXPRESSION "${REGEX}" FILES ${FILENAME})
+        source_group("${GROUP}\\${FILEPATH}" REGULAR_EXPRESSION "${REGEX}" FILES ${FILENAME})
 
     endforeach()
 

cmake/Custom.cmake

@@ -5,11 +5,17 @@
 
 include(FindPackageHandleStandardArgs)
 
+# work around CMP0053, see http://public.kitware.com/pipermail/cmake/2014-November/059117.html
+set(PROGRAMFILES_x86_ENV "PROGRAMFILES(x86)")
+
 find_program(cppcheck_EXECUTABLE
     NAMES
         cppcheck
     PATHS
         "${CPPCHECK_DIR}"
+        "$ENV{CPPCHECK_DIR}"
+        "$ENV{PROGRAMFILES}/Cppcheck"
+        "$ENV{${PROGRAMFILES_x86_ENV}}/Cppcheck"
 )
 
 find_package_handle_standard_args(cppcheck