From 0aff536ff8f490f1647fa219b4445129655361e5 Mon Sep 17 00:00:00 2001 From: Daniel Nachbaur Date: Mon, 5 Dec 2016 13:55:53 +0100 Subject: [PATCH] Release preparation (#528) --- CHANGES.md | 20 ++++++++++++++++---- CommonCompiler.cmake | 11 +++++++---- README.md | 7 ++++--- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a64adff..9db167d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,11 +1,23 @@ # git master +# 2016.12(09-Dec-2016) + * [527](https://github.com/Eyescale/CMake/pull/527): Refactor INSTALL_PACKAGES out of SubProject.cmake, also fixing a bug that the dependencies of a project were not installed if it did not have a .gitsubprojects file. +* [526](https://github.com/Eyescale/CMake/pull/526): + Provide getSchema() and toJSON() for generated version.h * [517](https://github.com/Eyescale/CMake/pull/517): - Clone sub projects in parallel. This feature can be optionally disabled. + Clone sub projects in parallel. This feature can be optionally disabled with + COMMON_SUBPROJECT_PARALLEL_CLONE set to OFF. +* [516](https://github.com/Eyescale/CMake/pull/516): + Support for GCC 6 +* [515](https://github.com/Eyescale/CMake/pull/515): + Tweaked configure output to only list not found dependencies; show all with + COMMON_FIND_PACKAGE_QUIET set to OFF +* [512](https://github.com/Eyescale/CMake/pull/512): + Add COMMON_DISABLE_WERROR option * [510](https://github.com/Eyescale/CMake/pull/510): Also create project-all target for super project * [507](https://github.com/Eyescale/CMake/pull/507): @@ -19,15 +31,15 @@ * Add support for yum to subproject_install_packages * Make sure that package installation is only attempted if INSTALL_PACKAGES is in the command line (i.e. do not cache the variable). - -# 2016.06 (30-Jun-2016) - * [503](https://github.com/Eyescale/CMake/pull/503): Added optional MODULE argument to common_find_package() as a hint for pkg_config. Example usage: common_find_package(RSVG MODULE librsvg-2.0) * [500](https://github.com/Eyescale/CMake/pull/500): Added WIN32 option to CommonApplication to be able to build WinMain-based apps (no console). + +# 2016.06 (30-Jun-2016) + * [497](https://github.com/Eyescale/CMake/pull/497): Fix install directory of common_application data * [494](https://github.com/Eyescale/CMake/pull/494): diff --git a/CommonCompiler.cmake b/CommonCompiler.cmake index 247dc3f..32ea253 100644 --- a/CommonCompiler.cmake +++ b/CommonCompiler.cmake @@ -8,6 +8,13 @@ # This defines the common_compile_options() function to apply compiler flags and # features for the given target. # +# CMake options: +# * COMMON_WARN_DEPRECATED: Enable compiler deprecation warnings, default ON +# * COMMON_ENABLE_CXX11_STDLIB: Enable C++11 stdlib, default OFF +# * COMMON_DISABLE_WERROR: Disable -Werror flags, default OFF +# * COMMON_ENABLE_CXX11_ABI: Enable C++11 ABI for gcc 5 or later, default ON, +# can be set to OFF with env variable CMAKE_COMMON_USE_CXX03_ABI +# # Input Variables # * COMMON_MINIMUM_GCC_VERSION check for a minimum gcc version, default 4.8 # @@ -77,10 +84,6 @@ if(CMAKE_COMPILER_IS_GCC OR CMAKE_COMPILER_IS_CLANG) if(GCC_COMPILER_VERSION VERSION_LESS COMMON_MINIMUM_GCC_VERSION) message(FATAL_ERROR "Using gcc ${GCC_COMPILER_VERSION}, need at least ${COMMON_MINIMUM_GCC_VERSION}") endif() - if(GCC_COMPILER_VERSION VERSION_LESS 4.8) - # http://stackoverflow.com/questions/4438084 - add_definitions(-D_GLIBCXX_USE_NANOSLEEP) - endif() if(NOT COMMON_ENABLE_CXX11_ABI) # http://stackoverflow.com/questions/30668560 add_definitions("-D_GLIBCXX_USE_CXX11_ABI=0") diff --git a/README.md b/README.md index b174ad8..39a20ff 100644 --- a/README.md +++ b/README.md @@ -34,9 +34,10 @@ The following CMake modules can be included in your project: more convenience over find_package and *common_find_package_post* (must be last after all common_find_package calls) to generate defines.h and options.cmake for feature checking. - * [CommonCompiler](CommonCompiler.cmake): Default compiler flags can be set - on given target to common_compile_options(), useful default warnings and - 'safe' C++11 features. + * [CommonCompiler](CommonCompiler.cmake): Default compiler flags and useful + default warnings can be set on given target to common_compile_options(); + automatically applied for targets created with common_application() and + common_library() * [GitInfo](GitInfo.cmake) sets variables with information about the git source tree. * [GitTargets](GitTargets.cmake) *branch*, *cut*, *tag*, *erase*, *retag*,