Commit Graph

34555 Commits

Author SHA1 Message Date
Brad King
f3619bbcd6 Help: Fix typo in <pkg>_NOT_FOUND_MESSAGE example in cmake-packages(7)
Fixes: #16616
2017-02-01 08:40:59 -05:00
Brad King
5efb8b9a5d Merge topic 'CSharpVS2017'
435cebaa VS: Fix CSharp compiler identification for VS 2017
2017-01-31 09:04:26 -05:00
Brad King
2e2c92edb0 Merge topic 'FindBoost-cache-unset-on-change'
97d61562 FindBoost: unset cache variables if the lib dir changes
2017-01-31 09:04:23 -05:00
Brad King
6ec0c09a7a Merge topic 'topic-reproducible-build'
5181f1f8 Tests: make tests pass with SOURCE_DATE_EPOCH set
2017-01-31 09:04:21 -05:00
Brad King
5accbaccbc Merge topic 'vs-export-external-objects'
4dde0bc8 VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for external objects
2017-01-31 09:04:19 -05:00
Brad King
f012a95836 Merge topic '16432-static-frameworks'
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
2017-01-31 09:04:16 -05:00
Brad King
8a76536e78 Merge topic 'developer-setup'
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)
2017-01-31 09:04:13 -05:00
Gilles Khouzam
435cebaaa1 VS: Fix CSharp compiler identification for VS 2017
The CSharp compiler for VS 2017 has moved from `MSBuildTools` to
`RoslynTargets`.  Account for both locations giving priority to the
`MSBuildTools` location.
2017-01-31 09:00:20 -05:00
Gregor Jasny
071f8e78dd Apple: Add support for static frameworks
Closes: #16432
2017-01-31 08:59:15 -05:00
Kitware Robot
07d3695e75 CMake Nightly Date Stamp 2017-01-31 00:01:05 -05:00
Brad King
050bb41ca7 Tell Git not to export the GitSetup directory
The `Utilities/GitSetup` directory is useful only in Git work trees
and so does not need to be distributed with source tarballs.
2017-01-30 16:56:31 -05:00
Brad King
d6108c87af GitSetup: Tell Git not to export .gitattributes
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.
2017-01-30 16:53:14 -05:00
Brad King
3642d657b1 Merge branch 'upstream-GitSetup' into developer-setup
* upstream-GitSetup:
  GitSetup 2016-12-13 (cd5ada6d)
2017-01-30 16:45:48 -05:00
GitSetup Upstream
7e5ef9ca78 GitSetup 2016-12-13 (cd5ada6d)
Code extracted from:

    https://gitlab.kitware.com/utils/gitsetup.git

at commit cd5ada6d5626da409d3ff108c341b9afd615803f (setup).
2017-01-30 16:45:47 -05:00
Brad King
a6fda7bf40 Merge branch 'upstream-GitSetup' into developer-setup 2017-01-30 16:45:07 -05:00
Brad King
a2d393d648 Add script to update GitSetup from upstream 2017-01-30 16:40:21 -05:00
GitSetup Upstream
c7b846edaa GitSetup 2012-04-26 (b7daff9b)
Code extracted from:

    https://gitlab.kitware.com/utils/gitsetup.git

at commit b7daff9b8b (setup).
2017-01-30 16:39:16 -05:00
Yves Frederix
97d61562d0 FindBoost: unset cache variables if the lib dir changes
This fixes a regression introduced by commit v3.3.0-rc1~5^2~2
(FindBoost: Search for debug and release libraries separately,
2015-01-26).  The `_Boost_CHANGE_LIBDIR` variable was split into
`_Boost_CHANGE_LIBDIR_{DEBUG,RELEASE}` but one usage site was not
updated.
2017-01-30 09:29:28 -05:00
Bernhard M. Wiedemann
5181f1f86a Tests: make tests pass with SOURCE_DATE_EPOCH set
Fix tests to account for commit 243aed52 (cmTimestamp: Support
SOURCE_DATE_EPOCH to override current time, 2017-01-25).

In openSUSE we are running the test-suite as part of the build and that
failed in these two places when building everything with
`SOURCE_DATE_EPOCH` set.
2017-01-30 09:25:44 -05:00
Zsolt Parragi
4dde0bc8ef VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for external objects
Teach Visual Studio generators to include external object files in the
list of objects whose symbols are to be exported.  The Makefile and
Ninja generators already did this.
2017-01-30 08:54:49 -05:00
Brad King
8df12fc9d4 Merge topic 'FeatureSummary_enhancement'
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
2017-01-30 08:43:23 -05:00
Brad King
5c6c766da1 Merge topic 'timestamp-percent'
6c54f7b3 string: Teach TIMESTAMP to treat %% as %
2017-01-30 08:43:21 -05:00
Brad King
e6659f6323 Merge topic 'test-preprocess-configs'
f01045ea Tests: Make Preprocess test work in RelWithDebInfo and MinSizeRel
2017-01-30 08:43:17 -05:00
Kitware Robot
cbabde81f2 CMake Nightly Date Stamp 2017-01-30 00:01:08 -05:00
Kitware Robot
84963f429a CMake Nightly Date Stamp 2017-01-29 00:01:03 -05:00
Kitware Robot
b30ac988d0 CMake Nightly Date Stamp 2017-01-28 00:01:05 -05:00
Bernhard M. Wiedemann
6c54f7b365 string: Teach TIMESTAMP to treat %% as %
This encoding is documented by `strptime`.
2017-01-27 09:25:37 -05:00
Gilles Khouzam
f01045ea36 Tests: Make Preprocess test work in RelWithDebInfo and MinSizeRel 2017-01-27 09:09:15 -05:00
Brad King
325c615308 Merge topic 'genex-if'
895f7f16 Genex: Add `IF` generator expression
2017-01-27 09:04:58 -05:00
Brad King
0ea578b498 Merge topic 'GNUG_define'
24d73fa0 GNUC: also check __GNUG__ define when checking for g++
2017-01-27 09:04:56 -05:00
Brad King
86ec0aca05 Merge topic 'topic-reproducible-build'
243aed52 cmTimestamp: Support SOURCE_DATE_EPOCH to override current time
2017-01-27 09:04:53 -05:00
Brad King
fa9c12933f Merge topic 'test-GeneratorExpression-update'
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
2017-01-27 09:04:49 -05:00
Daniele E. Domenichelli
560574b0c0 FeatureSummary: Update release notes 2017-01-27 09:24:28 +01:00
Kitware Robot
83596d4ba1 CMake Nightly Date Stamp 2017-01-27 00:01:05 -05:00
Gregor Jasny
d525754eab Xcode: Refactor RunCMake.Framework test to prepare for static frameworks 2017-01-26 13:34:58 -05:00
Gregor Jasny
45405f00d2 Xcode: Ignore Xcode project warning until issue is fixed
Issue: #15272
2017-01-26 13:34:40 -05:00
Gregor Jasny
50e1c1056e Makefile: For static libraries remove only the "real" lib before creating
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.
2017-01-26 13:30:37 -05:00
Gregor Jasny
8643ca75c7 Makefile: Re-order list of files to clean
Revise construction of the list of files to be cleaned for the target to
list the "real" file first.
2017-01-26 13:28:38 -05:00
Colby Pike
895f7f16a7 Genex: Add IF generator expression
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
2017-01-26 11:18:50 -05:00
Brad King
b8db2ed796 Merge topic 'tests_auto_type'
ef47272b Tests: use cxx_auto_type only if actually available
2017-01-26 10:40:47 -05:00
Brad King
90ee3bd3b0 Merge topic 'FindCUDA-select-flags-auto-msvc'
c1f3086d FindCUDA: Enable CUDA_SELECT_NVCC_ARCH_FLAGS Auto for MSVC
2017-01-26 10:40:44 -05:00
Brad King
4ab35eb661 Merge topic 'pkg-config-recheck'
796dea67 FindPkgConfig: Recheck pkg-config on parameter change.
2017-01-26 10:40:42 -05:00
Brad King
09cad30904 Merge topic 'FindGTK2_RunTwice'
4bc2c16b FindGTK2: Add unit test to check variables when run twice
9702b3ee FindGTK2: Fix GTK2_LIBRARIES and GTK2_TARGETS when called twice
2017-01-26 10:40:39 -05:00
Brad King
6ee9efa883 Merge topic 'FindLua-versioned-lib'
2759e225 FindLua: try to find library according to version from header
2017-01-26 10:40:36 -05:00
Bernhard M. Wiedemann
243aed525a cmTimestamp: Support SOURCE_DATE_EPOCH to override current time
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.
2017-01-26 10:21:41 -05:00
Brad King
c3a22518f8 Tests: Extend GeneratorExpression to work with more configurations
Add missing pieces for RelWithDebInfo and MinSizeRel.
2017-01-26 10:16:08 -05:00
Brad King
d491172445 Tests: Teach GeneratorExpression to cover spaces in include dirs
Add a space to the imported include directories used for the test.
This works around funny quoted-`;` interpretation by Visual Studio.
2017-01-26 10:11:25 -05:00
Brad King
1a2a9b0d08 Tests: Simplify GeneratorExpression imported include directory check
Do not duplicate the list of include directories 4 times.
2017-01-26 10:09:55 -05:00
Daniele E. Domenichelli
3cfde81835 FeatureSummary: Refactor to use global properties for package types
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.
2017-01-26 12:28:12 +01:00
Daniele E. Domenichelli
f0165eb624 FeatureSummary: Allow lists of dependencies in ADD_FEATURE_INFO 2017-01-26 10:52:37 +01:00