Commit Graph

26858 Commits

Author SHA1 Message Date
Brad King 1ade687d8d cmake-gui: Reset generator platform and toolset on configure (#15411)
At the start of each configure step we already reset the generator
selection (CMAKE_GENERATOR) to match that loaded for the current
project.  Add missing code to reset the generator platform and toolset
(CMAKE_GENERATOR_PLATFORM and CMAKE_GENERATOR_TOOLSET) also so that they
do not leak across projects.
2015-02-19 09:14:38 -05:00
Brad King da92cdab52 Merge branch 'cpack_rpm_mulit_prefix_fixup' into release 2015-02-11 11:08:37 -05:00
Brad King a4568ca597 Merge branch 'FindCoin3D-drop-link' into release 2015-02-11 11:08:32 -05:00
Brad King e2a8984c06 FindCoin3D: Drop link to project homepage
The project has moved from <http://www.coin3d.org/> to
<https://bitbucket.org/Coin3D/coin/wiki/Home>.  Simply drop the
out-dated link.  Few find modules have links to the project sites.
Anyone looking to use a given find module likely already knows about the
project it finds and can use a search engine to find its homepage.
2015-02-11 11:05:55 -05:00
Domen Vrankar be36bfd65d CPackRPM: Do not run file(GLOB_RECURSE) without CMP0009 set to NEW
The file(GLOB_RECURSE) call added by commit 3ec02547 (CPackRPM: Allow
multiple path relocation prefixes for one package, 2015-01-21) should
not follow directory symlinks, so make sure CMP0009 is set to NEW.
2015-02-11 09:56:27 -05:00
Brad King 0a95c5ce2e Merge branch 'fix_timeout_docs' into release 2015-02-10 12:59:32 -05:00
Zack Galbreath 56cb4a6c3a Help: Fix variable reference in TIMEOUT test property docs
Link to 'CTEST_TEST_TIMEOUT', not 'CTEST_TESTING_TIMEOUT'.
2015-02-10 12:58:01 -05:00
Brad King f3a6e0cb6a Merge branch 'bootstrap-sphinx-qthelp' into release 2015-02-10 10:07:35 -05:00
Nuno Sucena Almeida 85fd62ee91 bootstrap: Add --sphinx-qthelp option to enable qthelp doc generation 2015-02-10 10:03:10 -05:00
Brad King 001cd08187 Merge branch 'makefile-missing-comment' into release 2015-02-10 09:46:23 -05:00
Brad King 0b8d9581c0 Merge branch 'cpack_rpm_mulit_prefix_fixup' into release 2015-02-10 09:46:12 -05:00
Domen Vrankar 3d99355b11 CPackRPM: Fix recognition of absolute relocation paths
Fix typo in logic added by commit 3ec02547 (CPackRPM: Allow multiple
path relocation prefixes for one package, 2015-01-21).
2015-02-10 09:41:37 -05:00
Nils Gladitz eeb2831b5f Makefile: Fix regression in target-bound custom command COMMENT output
Fix a logic typo introduced by commit v3.1.0-rc1~781^2 (Generalize
cmCustomCommandGenerator to more fields, 2014-03-10).
2015-02-10 09:22:05 -05:00
Brad King 8772420e2f Merge branch 'no-global-setlocale' into release 2015-02-06 13:38:41 -05:00
Brad King 0f870234fe Merge branch 'backport-no-global-setlocale' into no-global-setlocale
Resolve conflict in Source/CMakeLists.txt by taking both changes.
2015-02-06 13:35:21 -05:00
Brad King cd408d93fd Add setlocale() calls around use of libarchive APIs (#14934, #15377)
The libarchive APIs use nl_langinfo(CODESET) for iconv so they need the
locale to be set for LC_CTYPE.  However, the rest of CMake does not
define any behavior for non-ASCII character classification/conversion so
we do not want to setlocale() globally.  Add a RAII class to save, set,
and restore the locale around calls to libarchive APIs.

Inspired-by: Clinton Stimpson <clinton@elemtech.com>
2015-02-06 13:32:57 -05:00
Brad King 87be2e1427 Do not call setlocale() globally in CMake applications (#15377)
Revert the changes made by commit v3.1.0-rc1~406^2~1 (Encoding: Add
setlocale() to applications, 2014-05-30) and commit v3.1.0-rc1~406^2
(Encoding: Change to only set LC_CTYPE, 2014-06-11), and other setlocale
calls added later in their spirit.  CMake has not been taught how to
deal with non-C locales everywhere.  We do not define any functionality
for character conversions for non-ASCII strings.  Another solution will
be needed to address the original problem motivating addition of
setlocale() calls.
2015-02-06 13:32:26 -05:00
Brad King cb01f15170 CMake 3.2.0-rc1 version update 2015-02-05 09:55:27 -05:00
Brad King 1ac598f53b Help: Drop development topic notes to prepare release
Release versions do not have the development topic section of
the CMake Release Notes index page.
2015-02-05 09:55:04 -05:00
Brad King 78c4418fa0 Merge topic 'rename-release-notes'
af8d1c17 Help: Rename 3.x.0 release notes to 3.x
2015-02-05 09:52:05 -05:00
Brad King af8d1c17e6 Help: Rename 3.x.0 release notes to 3.x
In commit v3.0.0-rc1~9 (Help: Rename 3.0 release notes to 3.0.0,
2014-02-19) we anticipated the possibility of bugfix-only release notes.
However, in practice we have no release notes for bug fix releases
because we do not cover bug fixes in release notes at all, only new
features.  Instead we've been updating the feature-level release notes
document in bug fix releases, treating errors in the document as bugs.

It makes more sense to maintain release notes at the feature-release
level, so rename the documents accordingly.  Also update the document
titles and intro text to refer only to feature versions and not bugfix
versions.
2015-02-05 09:50:56 -05:00
Brad King f9e05ea0d4 Merge topic 'doc-3.2-relnotes'
d81bbc3f Help: Add 3.2 release note for AUTORCC dependency tracking
0f38d9c2 Help: Add 3.2 release notes for file(GENERATE) features
0f580e8e Help: Organize and revise 3.2 release notes
e08a78dc Help: Consolidate 3.2 release notes
3a4381b6 Help: Add link target to cmake-language.7 encoding section
2015-02-05 09:25:18 -05:00
Brad King 02d031827d Merge topic 'update-docs'
f9839c49 Help: Document build targets automatically added to console pool.
44d6f3ce Help: Add some cross-linking.
2015-02-05 09:25:16 -05:00
Brad King 9042c875dc Merge topic 'fix-C-standard-features'
fb3487a9 Features: Fix C90 feature detection.
6027798a Features: Allow setting standard dialect below the default.
9d767810 Features: Populate CMAKE_<LANG>_STANDARD_DEFAULT only for supported compilers.
72537e44 Features: Add dialect compile flags only if default is known.
82c9d686 AppleClang: Remove redundant UNIX condition.
2015-02-05 09:25:14 -05:00
Brad King 0ae11b1fb0 Merge topic 'doc-try_compile'
219797e4 Help: Revise try_compile and try_run documentation (#15358)
2015-02-05 09:25:12 -05:00
Brad King 5c29e88972 Merge topic 'cpack-nsis-win64'
ecaee7ca CPack: Fix NSIS default 64-bit Windows install directory (#14211)
2015-02-05 09:25:10 -05:00
Brad King f55a2b2ac2 Merge branch 'release-3.1' 2015-02-05 09:08:42 -05:00
Stephen Kelly d81bbc3fce Help: Add 3.2 release note for AUTORCC dependency tracking 2015-02-05 08:43:23 -05:00
Stephen Kelly 0f38d9c2ad Help: Add 3.2 release notes for file(GENERATE) features 2015-02-05 08:43:23 -05:00
Brad King 0f580e8e67 Help: Organize and revise 3.2 release notes
Add section headers similar to the 3.1 release notes and move each
individual bullet into an appropriate section.  Revise and consolidate
some bullets covering related areas.

Co-Author: Stephen Kelly <steveire@gmail.com>
2015-02-05 08:43:22 -05:00
Brad King e08a78dc2c Help: Consolidate 3.2 release notes
Move all development release notes into a new version-specific document:

 tail -q -n +3 Help/release/dev/* > Help/release/3.2.0.rst
 git rm -- Help/release/dev/*

except the sample topic:

 git checkout HEAD -- Help/release/dev/0-sample-topic.rst

Reference the new document from the release notes index document.
Add a title and intro sentence to the new document by hand.
2015-02-05 08:43:22 -05:00
Brad King 3a4381b660 Help: Add link target to cmake-language.7 encoding section 2015-02-05 08:43:21 -05:00
Kitware Robot ebe1f4f896 CMake Nightly Date Stamp 2015-02-05 00:01:15 -05:00
Stephen Kelly fb3487a997 Features: Fix C90 feature detection.
This bug caused c_function_prototypes to not be recorded at configure
time when compiling with -std=gnu99 or similar. In the case of feature
recording, that was not a problem, because the logic in
CMakeDetermineCompileFeatures.cmake currently assumes that a feature
present for an earlier standard is present for a later standard.

However, the detection strings are also used in WriteCompilerDetectionHeader,
so the feature macro has been defined to '0' when using a later language
dialect.

Fix that by not checking the existence of the __STDC_VERSION__ macro at
all when detecting C90 features.
2015-02-04 18:38:21 -05:00
Stephen Kelly 6027798a30 Features: Allow setting standard dialect below the default.
If the requested standard dialect is older than the default dialect
then we must use a flag because we cannot decay to a newer standard.
2015-02-04 18:36:36 -05:00
Stephen Kelly 9d767810e1 Features: Populate CMAKE_<LANG>_STANDARD_DEFAULT only for supported compilers.
If no compiler feature information is known for a given compiler
version, do not set a language standard default either.  The two
settings must be recorded consistently.
2015-02-04 18:29:53 -05:00
Stephen Kelly 72537e4436 Features: Add dialect compile flags only if default is known.
The CMAKE_<LANG>_STANDARD_DEFAULT variable indicates whether the
compiler has any notion of standard levels and that CMake knows
about them.  If no language standard levels are available, skip
all logic to attempt to add a flag for the level.

Also fail with an internal error if a bad default value is set.
2015-02-04 18:28:07 -05:00
Stephen Kelly 82c9d6868b AppleClang: Remove redundant UNIX condition. 2015-02-04 18:28:06 -05:00
Brad King 219797e4be Help: Revise try_compile and try_run documentation (#15358)
Rewrite the documentation using better reStructuredText markup
constructs.  Clarify interaction of options like LINK_LIBRARIES and
CMAKE_FLAGS.
2015-02-04 16:06:13 -05:00
Stephen Kelly f9839c491e Help: Document build targets automatically added to console pool. 2015-02-04 21:52:13 +01:00
Stephen Kelly 44d6f3ce08 Help: Add some cross-linking. 2015-02-04 21:52:00 +01:00
Brad King ecaee7caca CPack: Fix NSIS default 64-bit Windows install directory (#14211)
When targeting Windows with a 64-bit architecture, use "$PROGRAMFILES64"
to get the Program Files folder.  Use CMAKE_SIZEOF_VOID_P to check for
the architecture size instead of CMAKE_CL_64 because the latter is not
defined for all compilers.

Inspired-by: Hugh Sorby <h.sorby@auckland.ac.nz>
Inspired-by: İsmail Dönmez <ismail@donmez.ws>
2015-02-04 15:11:10 -05:00
Brad King 44100adc6c CMake 3.1.2 2015-02-04 13:58:33 -05:00
Brad King eef9a47617 Merge branch 'release-3.1' 2015-02-04 12:30:58 -05:00
Brad King f560fdddd1 Merge topic 'fix-default-install-config'
dea42d92 install: Fix regression in default configuration selection
2015-02-04 12:30:17 -05:00
Brad King ff90f49d18 Merge topic 'fix-msvc-linker-flags-typo'
467f5bcc MSVC: Fix initialization of RelWithDebInfo shared library link flags (#15385)
2015-02-04 12:30:14 -05:00
Brad King be072d3fe1 Merge topic 'Qt-AUTOUIC-file-origin'
2fed8e17 QtAutogen: Issue error message with origin file (#15342).
2015-02-04 12:30:12 -05:00
Brad King 8f82004368 Merge topic 'CTestCoverageCollectGCOV-refinements'
809a5a5e Help: Add notes for topic 'CTestCoverageCollectGCOV-refinements'
03c0812c CTestCoverageCollectGCOV: Fix handling of international characters
8caa4e72 CTestCoverageCollectGCOV: Add test case
5c828cc8 CTestCoverageCollectGCOV: Allow custom flags to gcov
30cb628e CTestCoverageCollectGCOV: Fix handling of large file counts
2015-02-04 12:30:10 -05:00
Brad King 809a5a5e23 Help: Add notes for topic 'CTestCoverageCollectGCOV-refinements' 2015-02-04 12:21:52 -05:00
Kitware Robot 5f37785717 CMake Nightly Date Stamp 2015-02-04 00:01:09 -05:00