Commit Graph

26877 Commits

Author SHA1 Message Date
Brad King 693a944736 Merge branch 'install-manifest-optimize' into release 2015-02-26 15:06:00 -05:00
Robert Goulet c48141744e install: Write the entire installation manifest at once
Avoid a separate open/close for each file installed.  Use a single
file(WRITE) instead of a loop with file(APPEND).
2015-02-26 15:04:07 -05:00
Brad King cd935b03bf Merge branch 'sln-no-bom' into release 2015-02-24 13:32:05 -05:00
Brad King 987d4a1240 VS: Do not generate a BOM in .sln files
Revert commit v3.2.0-rc1~165^2 (Encoding:  Write Visual Studio solution
file with BOM, 2014-12-26).  The BOM breaks the VS IDE version selector
when loading the .sln from Windows Explorer.
2015-02-24 13:30:50 -05:00
Brad King 99575c9ac1 CMake 3.2.0-rc2 2015-02-23 11:10:12 -05:00
Brad King d95d4c2c77 Merge branch 'FindCurses-remove-unused-check' into release 2015-02-20 08:42:35 -05:00
Brad King b4005a3ad9 FindCurses: Drop unused check for cbreak in tinfo library
This check was first added by commit v3.0.0-rc5~6^2 (FindCurses: Detect
and satisfy ncurses dependency on tinfo, 2014-01-17), but it is not
correctly conditioned on existence of the tinfo library and fails if the
code path is taken but tinfo is not found.  However, since commit
v3.2.0-rc1~369^2 (FindCurses: Drop search for deprecated HP-UX cur_colr
library, 2014-11-17) the result of the check is not used, so simply drop
it.
2015-02-20 08:41:36 -05:00
Brad King 57d4e1c776 Merge branch 'private-FindJsonCpp' into release 2015-02-20 08:33:03 -05:00
Brad King a41d621d30 bootstrap: Add --(no-)system-jsoncpp options
Provide bootstrap-time control for using a system JsonCpp library.
2015-02-20 08:28:03 -05:00
Brad King a576844263 FindJsonCpp: Drop new module due to upstream jsoncpp providing package
Since jsoncpp 0.7.0 (2014-11-20) the upstream may provide a CMake
package configuration file such that find_package(jsoncpp) will find a
jsoncppConfig.cmake file.  In order to avoid conflicting with this
(especially on case-insensitive filesystems), and since we always prefer
projects to provide package config files (that they maintain), it is
better to not provide FindJsonCpp publicly.

Move FindJsonCpp into a private source directory that is not installed
so that we can still use it for building CMake itself.

Reported-by: Ryan Pavlik <ryan.pavlik@gmail.com>
2015-02-20 08:22:02 -05:00
Brad King 20f64bd2da Merge branch 'cmake-gui-reset-generator-toolset-and-platform' into release 2015-02-19 09:19:57 -05:00
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 05e4fc6b2a Merge branch 'binary-release-no-OpenSSL-on-Win-or-OSX' into release 2015-02-18 09:30:29 -05:00
Brad King 7e6608fe64 Utilities/Release: Build OS X and Win binaries without OpenSSL
This will tell our curl to use the OS-native TLS/SSL APIs.
2015-02-18 09:29:50 -05:00
Brad King 8371cd7893 Merge branch 'FindJNI-awt-arch' into release 2015-02-18 09:20:24 -05:00
Tiago Stürmer Daitx bce4e20f78 FindJNI: Add arch-specific library dir for JDK 9 layout (#15408)
JDK9's directory structure changes and no jdk/jre exists.  The arch
lib path is now jdk/lib/<arch> (instead of jdk/jre/lib/<arch>).
2015-02-18 09:19:17 -05:00
Brad King 9457bf9f40 Merge branch 'doc-3.2-relnotes-fixup' into release 2015-02-13 13:49:50 -05:00
Brad King 6d19ef9b7c Help: In 3.2 relnotes move OpenGL/X11 to deprecated/removed section
It is a possibly incompatible change.
2015-02-13 13:45:15 -05:00
Brad King 481ec779ab Merge branch 'doc-configure_file-output-location' into release 2015-02-12 16:22:15 -05:00
Brad King 029d38fa61 Help: Revise configure_file documentation (#15403)
Format the documentation with better reST markup.  Revise the
wording to clarify how relative paths are handled.  Also add
an example section.
2015-02-12 16:20:32 -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