summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cxx98-features'Brad King2014-04-308-0/+56
|\ | | | | | | | | a36b957f Features: Add cxx_template_template_parameters.
| * Features: Add cxx_template_template_parameters.Stephen Kelly2014-04-168-0/+56
| | | | | | | | | | Extend the existing feature infrastructure as needed to support both C++11 and C++98 features.
* | Merge branch 'release'Brad King2014-04-300-0/+0
|\ \
| * \ Merge branch 'doc-singlehtml' into releaseBrad King2014-04-251-1/+13
| |\ \
| * \ \ Merge branch 'doc-full-help' into releaseBrad King2014-04-254-3/+20
| |\ \ \
* | | | | CMake Nightly Date StampKitware Robot2014-04-301-1/+1
| | | | |
* | | | | Merge topic 'UseSWIG-go-support'Brad King2014-04-291-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a3b1be5e UseSWIG: Add support for Go and Lua
| * | | | | UseSWIG: Add support for Go and LuaJulien Schueller2014-04-291-0/+4
| | | | | |
* | | | | | Merge topic 'doc-singlehtml'Brad King2014-04-291-1/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aaa6c8a6 Merge branch 'master' into doc-singlehtml faf291a9 Utilities/Sphinx: Add option to build 'singlehtml' format
| * \ \ \ \ \ Merge branch 'master' into doc-singlehtmlBrad King2014-04-241213-10845/+21251
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Resolve conflicts in Utilities/Sphinx/CMakeLists.txt by adding the help options from both sides.
| * | | | | | Utilities/Sphinx: Add option to build 'singlehtml' formatBrad King2014-04-241-1/+13
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Add SPHINX_SINGLEHTML to enable the Sphinx 'singlehtml' builder.
* | | | | | Merge topic 'doc-full-help'Brad King2014-04-294-3/+20
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | 478356e6 Restore --help-full option to output all help manuals
| * | | | | Restore --help-full option to output all help manualsBrad King2014-04-254-3/+20
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This option was removed during conversion to the reStructuredText documentation. Restore it. Process documentation starting at Help/index.rst so that all manuals are included in the output.
* | | | | CMake Nightly Date StampKitware Robot2014-04-291-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-04-281-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-04-271-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-04-261-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-04-251-1/+1
| |/ / / |/| | |
* | | | Merge branch 'release'Brad King2014-04-240-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'sphinx-python3' into releaseBrad King2014-04-241-1/+4
| |\ \ \
* | \ \ \ Merge topic 'sphinx-python3'Brad King2014-04-241-1/+4
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | d55671ad Utilities/Sphinx: Fix cmake domain document removal with python3
| * | | | Utilities/Sphinx: Fix cmake domain document removal with python3Brad King2014-04-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the domain clear_doc method, avoid removing entries from a dictionary while iterating over it. Instead accumulate a set of entries to remove at the end.
* | | | | Merge topic 'FindGTK2-X11'Brad King2014-04-241-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 55f5ea7b FindGTK2: search for Fontconfig and X11 before using them
| * | | | | FindGTK2: search for Fontconfig and X11 before using themRolf Eike Beer2014-04-231-4/+4
| | | | | |
* | | | | | Merge topic 'aix-streams'Brad King2014-04-241-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 817db64c fix compile error on AIX/gcc-2.9 because of unknown std::stringstream
| * | | | | | fix compile error on AIX/gcc-2.9 because of unknown std::stringstreamRolf Eike Beer2014-04-221-2/+2
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-04-241-1/+1
| |/ / / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-04-231-1/+1
|/ / / / /
* | | | | Merge branch 'release'Brad King2014-04-220-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'osx-CFBundle-info-plist' into releaseBrad King2014-04-221-1/+1
| |\ \ \ \
* | \ \ \ \ Merge topic 'osx-CFBundle-info-plist'Brad King2014-04-220-0/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | e4e76f28 Merge branch 'master' into osx-CFBundle-info-plist 149ce5db OS X: Fix Info.plist placement in a CFBundle
| * | | | | Merge branch 'master' into osx-CFBundle-info-plistBrad King2014-04-22772-7463/+10915
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | Resolve conflict in Source/cmOSXBundleGenerator.cxx by taking the side from 'master'.
| * | | | | OS X: Fix Info.plist placement in a CFBundleTim Blechmann2014-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cmOSXBundleGenerator::CreateCFBundle to place Info.plist under the same root directory as the rest of the bundle. Without this, Info.plist was placed into CMAKE_BINARY_DIR, not CMAKE_CURRENT_BINARY_DIR because the target path was not generated correctly.
* | | | | | CMake Nightly Date StampKitware Robot2014-04-221-1/+1
| | | | | |
* | | | | | Merge topic 'feature-absence-hard-error'Brad King2014-04-2113-10/+79
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d0b1cca Features: FATAL_ERROR on compilers with no recorded features. 447fbb3f Tests: Execute compile features tests unconditionally. 597bb72e Tests: Run RunCMake.target_compile_features unconditionally.
| * | | | | | Features: FATAL_ERROR on compilers with no recorded features.Stephen Kelly2014-04-179-2/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users of the new target_compile_features command are expected to check the existence of the CMAKE_CXX_COMPILE_FEATURES variable before attempting to use it to require features.
| * | | | | | Tests: Execute compile features tests unconditionally.Stephen Kelly2014-04-173-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conditionally create a dummy test if there are no known features.
| * | | | | | Tests: Run RunCMake.target_compile_features unconditionally.Stephen Kelly2014-04-161-3/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | It is so far testing only cases which are fatal regardless of recorded features.
* | | | | | Merge topic 'fix-wix-cpack-crash'Brad King2014-04-212-6/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb59f5da CPackWIX: Delay creation of cmWIXPatch until CPack has initialized Logger
| * | | | | | CPackWIX: Delay creation of cmWIXPatch until CPack has initialized LoggerNils Gladitz2014-04-182-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the fix CPack will crash when the cmWIXPatch class tries to issue any diagnostics.
* | | | | | | Merge topic 'ExternalData-missing-not-fatal'Brad King2014-04-2114-25/+96
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ccd29b9a ExternalData: Warn on missing file instead of failing
| * | | | | | | ExternalData: Warn on missing file instead of failingBrad King2014-04-1714-25/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the primary source tree path named by a DATA{} reference does not exist, produce an AUTHOR_WARNING instead of a FATAL_ERROR. This is useful when writing a new DATA{} reference to a test reference output that has not been created yet. This way the developer can run the test, manually verify the output, and then copy it into place to provide the reference and eliminate the warning. If the named source tree path is expected to be a file but exists as a directory, we still need to produce a FATAL_ERROR.
* | | | | | | | Merge topic 'CMP0052-docs'Brad King2014-04-212-1/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 692228e4 Help: Link to cmake-buildsystem from CMP0052 docs. e5e9b8e9 Help: Add code example for INSTALL_INTERFACE to cmake-buildsystem.
| * | | | | | | | Help: Link to cmake-buildsystem from CMP0052 docs.Stephen Kelly2014-04-171-0/+3
| | | | | | | | |
| * | | | | | | | Help: Add code example for INSTALL_INTERFACE to cmake-buildsystem.Stephen Kelly2014-04-171-1/+11
| |/ / / / / / /
* | | | | | | | Merge topic 'internal-error-backtrace'Brad King2014-04-211-0/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3de4c295 cmake: Print C++ stack trace after INTERNAL_ERROR messages
| * | | | | | | | cmake: Print C++ stack trace after INTERNAL_ERROR messagesBrad King2014-04-171-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since an INTERNAL_ERROR is always a bug, it will be useful to have the program stack trace available in the report.
* | | | | | | | | Merge topic 'autorcc-target-dir'Brad King2014-04-213-2/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33774ca2 QtAutogen: Put generated qrc files in a target-specific dir.
| * | | | | | | | | QtAutogen: Put generated qrc files in a target-specific dir.Stephen Kelly2014-04-183-2/+12
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'FindGTK2_fix_bsd'Brad King2014-04-211-10/+28
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5a6069a FindGTK2: Add GTK2_(FONTCONFIG|X11)_INCLUDE_DIR optional includes ef9366b0 FindGTK2: Add /usr/X11R6/ to include paths