summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic '16432-static-frameworks'Brad King2017-01-3117-109/+211
|\ | | | | | | | | | | | | | | | | 071f8e78 Apple: Add support for static frameworks d525754e Xcode: Refactor RunCMake.Framework test to prepare for static frameworks 45405f00 Xcode: Ignore Xcode project warning until issue is fixed 50e1c105 Makefile: For static libraries remove only the "real" lib before creating 8643ca75 Makefile: Re-order list of files to clean
| * Apple: Add support for static frameworksGregor Jasny2017-01-3114-62/+178
| | | | | | | | Closes: #16432
| * Xcode: Refactor RunCMake.Framework test to prepare for static frameworksGregor Jasny2017-01-262-33/+18
| |
| * Xcode: Ignore Xcode project warning until issue is fixedGregor Jasny2017-01-261-1/+1
| | | | | | | | Issue: #15272
| * Makefile: For static libraries remove only the "real" lib before creatingGregor Jasny2017-01-261-13/+14
| | | | | | | | | | | | | | When creating a static library with the archive tool, only the `.a` needs to be removed to start a fresh archive. Any other files (e.g. symbolic links we may later add) are not managed by the archive tool and therefore do not need to be cleaned.
| * Makefile: Re-order list of files to cleanGregor Jasny2017-01-261-4/+4
| | | | | | | | | | Revise construction of the list of files to be cleaned for the target to list the "real" file first.
* | Merge topic 'developer-setup'Brad King2017-01-3112-11/+552
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 050bb41c Tell Git not to export the GitSetup directory d6108c87 GitSetup: Tell Git not to export .gitattributes 3642d657 Merge branch 'upstream-GitSetup' into developer-setup 7e5ef9ca GitSetup 2016-12-13 (cd5ada6d) a6fda7bf Merge branch 'upstream-GitSetup' into developer-setup a2d393d6 Add script to update GitSetup from upstream c7b846ed GitSetup 2012-04-26 (b7daff9b)
| * | Tell Git not to export the GitSetup directoryBrad King2017-01-301-0/+1
| | | | | | | | | | | | | | | The `Utilities/GitSetup` directory is useful only in Git work trees and so does not need to be distributed with source tarballs.
| * | GitSetup: Tell Git not to export .gitattributesBrad King2017-01-301-1/+0
| | | | | | | | | | | | | | | | | | | | | GitSetup upstream added an attribute to export `.gitattributes` so that importing snapshots into the sources of other projects would bring along the attributes. However, we don't want to export them from CMake. Drop `.gitattributes` entries not relevant to CMake.
| * | Merge branch 'upstream-GitSetup' into developer-setupBrad King2017-01-3010-11/+532
| |\ \ | | | | | | | | | | | | | | | | * upstream-GitSetup: GitSetup 2016-12-13 (cd5ada6d)
| | * | GitSetup 2016-12-13 (cd5ada6d)GitSetup Upstream2017-01-3010-11/+532
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/gitsetup.git at commit cd5ada6d5626da409d3ff108c341b9afd615803f (setup).
| * | | Merge branch 'upstream-GitSetup' into developer-setupBrad King2017-01-300-0/+0
| |\ \ \ | | |/ /
| | * | GitSetup 2012-04-26 (b7daff9b)GitSetup Upstream2017-01-3011-0/+805
| | / | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/gitsetup.git at commit b7daff9b8b776eeed34385d8ae2019dc9e113c52 (setup).
| * | Add script to update GitSetup from upstreamBrad King2017-01-301-0/+20
| | |
* | | CMake Nightly Date StampKitware Robot2017-01-311-1/+1
|/ /
* | Merge topic 'FeatureSummary_enhancement'Brad King2017-01-3044-109/+769
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 560574b0 FeatureSummary: Update release notes 3cfde818 FeatureSummary: Refactor to use global properties for package types f0165eb6 FeatureSummary: Allow lists of dependencies in ADD_FEATURE_INFO 9da7bf08 FeatureSummary: Add QUIET_ON_EMPTY option to feature_summary 4cf4aceb FeatureSummary: Add unit tests 614a97a5 FeatureSummary: Do not force OPTIONAL type in SET_PACKAGE_PROPERTIES 65a0bfd8 FeatureSummary: Add deprecation warnings to deprecated commands 4da3cae9 FeatureSummary: Clean printed output
| * | FeatureSummary: Update release notesDaniele E. Domenichelli2017-01-271-0/+22
| | |
| * | FeatureSummary: Refactor to use global properties for package typesDaniele E. Domenichelli2017-01-2619-70/+379
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These new global properties were added: * FeatureSummary_PKG_TYPES: Package types accepted by FeatureSummary (default REQUIRED RECOMMENDED OPTIONAL RUNTIME). * FeatureSummary_REQUIRED_PKG_TYPES: Package types that will cause FeatureSummary to abort when called with FATAL_ON_MISSING_REQUIRED_PACKAGES and a package in these categories is missing (default REQUIRED). * FeatureSummary_DEFAULT_PKG_TYPE: Default package type assigned when not explicitly assigned by the user (default OPTIONAL). This allows to add and remove new package types that can be printed selectively using the "WHAT" argument.
| * | FeatureSummary: Allow lists of dependencies in ADD_FEATURE_INFODaniele E. Domenichelli2017-01-264-2/+35
| | |
| * | FeatureSummary: Add QUIET_ON_EMPTY option to feature_summaryDaniele E. Domenichelli2017-01-264-13/+43
| | | | | | | | | | | | | | | This option suppresses the output when the list of packages that belong to the selected category is empty.
| * | FeatureSummary: Add unit testsDaniele E. Domenichelli2017-01-2616-0/+259
| | |
| * | FeatureSummary: Do not force OPTIONAL type in SET_PACKAGE_PROPERTIESDaniele E. Domenichelli2017-01-261-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OPTIONAL type is used anyway as default when the type is not set Since RUNTIME < OPTIONAL, forcing it here forces the user to set "RUNTIME" at the first SET_PACKAGE_PROPERTIES, otherwise it is impossible to set it later. Without this it is impossible, for example, to add package information (URL and DESCRIPTION) in the FindPackage file, but allow the package to be RUNTIME.
| * | FeatureSummary: Add deprecation warnings to deprecated commandsDaniele E. Domenichelli2017-01-261-0/+6
| | |
| * | FeatureSummary: Clean printed outputDaniele E. Domenichelli2017-01-266-14/+17
| | | | | | | | | | | | | | | | | | | | | * Remove space before commas * Do not add an empty line before the first type of packages Also fix a typo in unit test.
* | | Merge topic 'timestamp-percent'Brad King2017-01-305-2/+9
|\ \ \ | | | | | | | | | | | | | | | | 6c54f7b3 string: Teach TIMESTAMP to treat %% as %
| * | | string: Teach TIMESTAMP to treat %% as %Bernhard M. Wiedemann2017-01-275-2/+9
| | | | | | | | | | | | | | | | This encoding is documented by `strptime`.
* | | | Merge topic 'test-preprocess-configs'Brad King2017-01-301-4/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f01045ea Tests: Make Preprocess test work in RelWithDebInfo and MinSizeRel
| * | | | Tests: Make Preprocess test work in RelWithDebInfo and MinSizeRelGilles Khouzam2017-01-271-4/+10
| | |_|/ | |/| |
* | | | CMake Nightly Date StampKitware Robot2017-01-301-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2017-01-291-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2017-01-281-1/+1
| |/ / |/| |
* | | Merge topic 'genex-if'Brad King2017-01-279-0/+62
|\ \ \ | | | | | | | | | | | | | | | | 895f7f16 Genex: Add `IF` generator expression
| * | | Genex: Add `IF` generator expressionColby Pike2017-01-269-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows a single condition to be used to choose between two alternatives. Without this the condition must be duplicated with one surrounded by `NOT`. Closes: #15585
* | | | Merge topic 'GNUG_define'Brad King2017-01-272-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 24d73fa0 GNUC: also check __GNUG__ define when checking for g++
| * | | | GNUC: also check __GNUG__ define when checking for g++Rolf Eike Beer2017-01-252-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least the scratchbox compiler for the N900, which basically is a gcc 4.2, sets only __GNUG__ in C++ mode, but not __GNUC__. It does indeed set __GNUC_MINOR__ and __GNUC_PATCHLEVEL__. Extend the compiler detection code for GNU compilers in C++ mode to look at __GNUG__ in case __GNUC__ is absent.
* | | | | Merge topic 'topic-reproducible-build'Brad King2017-01-2716-0/+47
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 243aed52 cmTimestamp: Support SOURCE_DATE_EPOCH to override current time
| * | | | | cmTimestamp: Support SOURCE_DATE_EPOCH to override current timeBernhard M. Wiedemann2017-01-2616-0/+47
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | See https://reproducible-builds.org/ for why this is good and https://reproducible-builds.org/specs/source-date-epoch/ for the definition of this variable.
* | | | | Merge topic 'test-GeneratorExpression-update'Brad King2017-01-272-17/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3a22518 Tests: Extend GeneratorExpression to work with more configurations d4911724 Tests: Teach GeneratorExpression to cover spaces in include dirs 1a2a9b0d Tests: Simplify GeneratorExpression imported include directory check
| * | | | | Tests: Extend GeneratorExpression to work with more configurationsBrad King2017-01-262-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Add missing pieces for RelWithDebInfo and MinSizeRel.
| * | | | | Tests: Teach GeneratorExpression to cover spaces in include dirsBrad King2017-01-262-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a space to the imported include directories used for the test. This works around funny quoted-`;` interpretation by Visual Studio.
| * | | | | Tests: Simplify GeneratorExpression imported include directory checkBrad King2017-01-262-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | Do not duplicate the list of include directories 4 times.
* | | | | | CMake Nightly Date StampKitware Robot2017-01-271-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'tests_auto_type'Brad King2017-01-262-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ef47272b Tests: use cxx_auto_type only if actually available
| * | | | | Tests: use cxx_auto_type only if actually availableRolf Eike Beer2017-01-252-1/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | The presence of CMAKE_CXX_COMPILE_FEATURES doesn't mean cxx_auto_type is always available.
* | | | | Merge topic 'FindCUDA-select-flags-auto-msvc'Brad King2017-01-261-9/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c1f3086d FindCUDA: Enable CUDA_SELECT_NVCC_ARCH_FLAGS Auto for MSVC
| * | | | | FindCUDA: Enable CUDA_SELECT_NVCC_ARCH_FLAGS Auto for MSVCBjoern Thiel2017-01-251-9/+11
| | |_|/ / | |/| | | | | | | | | | | | | Fixes: #16525
* | | | | Merge topic 'pkg-config-recheck'Brad King2017-01-262-1/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 796dea67 FindPkgConfig: Recheck pkg-config on parameter change.
| * | | | | FindPkgConfig: Recheck pkg-config on parameter change.Matthew Hanna2017-01-252-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, once pkg_check_modules succeeds, it will never call _pkg_check_modules_internal again. That means that if the parameters to pkg_check_modules are changed, cmake will be called to reconfigure, but nothing will change. This change is to store the full string of arguments to pkg_check_modules and override the FOUND optimization so that the arguments are reevaluated when modified.
* | | | | | Merge topic 'FindGTK2_RunTwice'Brad King2017-01-265-42/+72
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bc2c16b FindGTK2: Add unit test to check variables when run twice 9702b3ee FindGTK2: Fix GTK2_LIBRARIES and GTK2_TARGETS when called twice
| * | | | | | FindGTK2: Add unit test to check variables when run twiceDaniele E. Domenichelli2017-01-254-0/+32
| | | | | | |