summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CompileFlags: Test for C++ features after selecting flagsRolf Eike Beer2014-04-041-1/+2
| | | | Some flags we select may affect availability of C++ features.
* Merge topic 'generate-qch-doc'Brad King2014-04-012-1/+41
|\ | | | | | | | | 85582d14 Help: Add option to create and install Qt .qch file.
| * Help: Add option to create and install Qt .qch file.Stephen Kelly2014-03-312-1/+41
| |
* | Merge topic 'simplify-ninja-linker-command'Brad King2014-04-011-51/+29
|\ \ | | | | | | | | | | | | 2b896752 Ninja: Simplify code for linker commands
| * | Ninja: Simplify code for linker commandsJiri Malak2014-04-011-51/+29
| |/ | | | | | | | | Use GetCreateRuleVariable function instead of redundant code for Rule variable name. Use temporary variables to improve code.
* | Merge topic 'fix_policy_diagnostics'Brad King2014-04-0120-112/+34
|\ \ | | | | | | | | | | | | 77b581c2 Policies: omit warnings about unset policies when they are actually set to NEW
| * | Policies: omit warnings about unset policies when they are actually set to NEWNils Gladitz2014-03-3120-112/+34
| | |
* | | Merge topic 'clang-warnings'Brad King2014-04-013-4/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | 8c9c4fe1 Remove 'return' statements that can never be reached 50ca77f4 create_test_sourcelist: Initialize variable at declaration
| * | | Remove 'return' statements that can never be reachedSean McBride2014-03-312-2/+0
| | | | | | | | | | | | | | | | Clang -Wunreachable-code-return warns otherwise.
| * | | create_test_sourcelist: Initialize variable at declarationSean McBride2014-03-311-2/+1
| |/ / | | | | | | | | | Clang -Wconditional-uninitialized warns otherwise.
* | | Merge topic 'cmake-gui-symlinks'Brad King2014-04-012-4/+8
|\ \ \ | | | | | | | | | | | | | | | | 480be00b cmake-gui: Don't resolve symlinks with using file dialog.
| * | | cmake-gui: Don't resolve symlinks with using file dialog.Clinton Stimpson2014-03-302-4/+8
| | | | | | | | | | | | | | | | | | | | This fixes bug #14274 where a clang++ symlink was resolved to a clang executable.
* | | | Merge topic 'find_package-check-quiet'Brad King2014-04-0129-49/+186
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 83934757 Find*: Make find_package(.. QUIET) affect Check* modules. 4c0cc9ab Check*.cmake : Add CMAKE_REQUIRED_QUIET flag.
| * | | | Find*: Make find_package(.. QUIET) affect Check* modules.Clinton Stimpson2014-03-3013-11/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issues #14812 and #14813 where find_package(OpenMP QUIET) and find_package(Qt4 QUIET) would still print out messages when calling check*() functions. Also a partial fix for #14445 where building CMake (without cmake-gui) when Qt5 is installed and Qt4 is not installed and warnings come out of FindQt4.cmake.
| * | | | Check*.cmake : Add CMAKE_REQUIRED_QUIET flag.Clinton Stimpson2014-03-3016-38/+132
| |/ / / | | | | | | | | | | | | | | | | Setting this flag can silence messages from the Check*.cmake modules. This can be used by Find*.cmake modules when they are in silent mode.
* | | | Merge topic 'hpux-processorcount'Brad King2014-04-011-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | c3e238dd ProcessorCount: use mpsched on HPUX if machinfo is not present
| * | | | ProcessorCount: use mpsched on HPUX if machinfo is not presentRolf Eike Beer2014-03-281-0/+12
| | | | | | | | | | | | | | | | | | | | Co-Author: Gerhard Grimm <gerhard.grimm@detec.com>
* | | | | Merge topic 'ExternalProject_GitUpdate'Brad King2014-04-011-7/+101
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2128d4c ExternalProject: Improve handling of git remote branches ff2451dc ExternalProject: Strip trailing space from git hash
| * | | | | ExternalProject: Improve handling of git remote branchesDaniele E. Domenichelli2014-04-011-7/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ExternalProject handles git remote branches by commit hash. Due to this, the git repository ends in detached states, and local commits are discarded. Use "git rebase" for remote branches instead of "git checkout". If there are uncommitted changes, use "git stash save/pop" to save changes and restore them after the rebase. If any of these operations fails, try to restore the original status and exit with a fatal error, asking the user to resolve the conflicts manually. This also makes the behaviour of ExternalProject using git more similar to the svn version, and probably more likely to what the user expects by setting GIT_TAG to a branch.
| * | | | | ExternalProject: Strip trailing space from git hashDaniele E. Domenichelli2014-04-011-0/+2
| | | | | |
* | | | | | Merge topic 'link-line-quoting'Brad King2014-04-018-67/+87
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 423009c1 Makefile: Generate single-quoted object lists for Watcom a863a8fe cmLocalUnixMakefileGenerator3: Re-organize ConvertToQuotedOutputPath
| * | | | | | Makefile: Generate single-quoted object lists for WatcomJiri Malak2014-03-278-36/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the CMAKE_NO_QUOTED_OBJECTS internal variable from the Makefile generators. The underlying problem is with the Watcom linker, not with WMake. The Watcom linker wants object files to be single-quoted. Add <LINK-RULE>_USE_WATCOM_QUOTE platform information variables to tell the generators to use Watcom-style single quotes for object files on link lines. On Windows, Watcom uses the GetCommandLine API to get the original command-line string and do custom parsing that expects single quotes. On POSIX systems, Watcom approximates the original command line by joining all argv[] entries separated by a single space. Therefore we need to double-quote the single-quoted arguments so that the shell does not consume them and they are available for the parser to see.
| * | | | | | cmLocalUnixMakefileGenerator3: Re-organize ConvertToQuotedOutputPathJiri Malak2014-03-271-33/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use one code path whether the components list is empty or not. Fix indentation accordingly.
* | | | | | | Merge topic 'UseSWIG-NO_SONAME'Brad King2014-04-011-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f26147b8 UseSWIG: Enable NO_SONAME on swig modules (#14815)
| * | | | | | | UseSWIG: Enable NO_SONAME on swig modules (#14815)Julien Schueller2014-04-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swig modules are plugins and do not need the SONAME field set.
* | | | | | | | CMake Nightly Date StampKitware Robot2014-04-011-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-03-311-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-03-301-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-03-291-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-03-281-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'osx-CFBundle-info-plist'Brad King2014-03-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 90e22f8f OS X: Fix Info.plist placement in a CFBundle
| * | | | | OS X: Fix Info.plist placement in a CFBundleTim Blechmann2014-03-261-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.
* | | | | Merge topic 'threads-cleanup'Brad King2014-03-271-17/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 693f8bf3 FindThreads: simplify checking for SunOS 858ce31f FindThreads: avoid useless checks if a thread library is already found fdf7bd27 FindThreads: replace MATCHES with STREQUAL
| * | | | | FindThreads: simplify checking for SunOSRolf Eike Beer2014-03-251-1/+1
| | | | | |
| * | | | | FindThreads: avoid useless checks if a thread library is already foundRolf Eike Beer2014-03-251-16/+15
| | | | | |
| * | | | | FindThreads: replace MATCHES with STREQUALRolf Eike Beer2014-03-251-1/+1
| | | | | |
* | | | | | Merge topic 'suppress-diagnostic-context-note-warnings'Brad King2014-03-271-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53674755 CTestCustom: Suppress "note: in expansion of macro" diagnostic context
| * | | | | | CTestCustom: Suppress "note: in expansion of macro" diagnostic contextBrad King2014-03-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Such notes only appear with other diagnostics and should not be considered a warning on their own.
* | | | | | | Merge topic 'fix-CTestTestMemcheck-xcode2-missing-dirs'Brad King2014-03-272-14/+21
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | 27b81213 Tests/CTestTestMemcheck: Help Xcode 2.x create output dirs
| * | | | | | Tests/CTestTestMemcheck: Help Xcode 2.x create output dirsBrad King2014-03-262-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the PRE_BUILD step to all targets that need it so the output directories get created no matter which target is built first.
* | | | | | | CMake Nightly Date StampKitware Robot2014-03-271-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'fix-Qt-manual-typo'Brad King2014-03-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | dcfbbe87 Help: Fix typo in cmake-qt manual.
| * | | | | | Help: Fix typo in cmake-qt manual.Stephen Kelly2014-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Do -> To.
* | | | | | | Merge topic 'dev/find-boost-graph_parallel'Brad King2014-03-261-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f284b003 FindBoost: Search next to MPI libs for graph_parallel (#14832)
| * | | | | | | FindBoost: Search next to MPI libs for graph_parallel (#14832)Ben Boeckel2014-03-251-1/+2
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | In addition to the MPI libraries, graph_parallel lives in the MPI libdir as well.
* | | | | | | Merge topic 'fix-Qt-Autogen'Brad King2014-03-268-7/+84
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71a11252 QtAutogen: Fix use of multiple ui files in a single target. 261acd91 QtAutogen: Use the basename for resource files.
| * | | | | | | QtAutogen: Fix use of multiple ui files in a single target.Stephen Kelly2014-03-256-6/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't store a mapping of the directory to the ui file. The directory will be a unique key, allowing only one ui file to be specified. Use the source file name instead as the mapping key.
| * | | | | | | QtAutogen: Use the basename for resource files.Stephen Kelly2014-03-254-1/+10
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rcc tool generates a cpp file with a symbol called qInitResources or called qInitResources_${name}, if the name is passed. The qInitResources symbol clashes if multiple qrc files are used in one target. Always pass the name to ensure that the symbol is unique. This is also the behavior of the qtx_add_resource macros.
* | | | | | | Merge topic 'simplify-empty-LDFLAGS'Brad King2014-03-261-6/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b18f442 Avoid trailing space in CMAKE_*_LINKER_FLAGS when LDFLAGS is empty
| * | | | | | | Avoid trailing space in CMAKE_*_LINKER_FLAGS when LDFLAGS is emptyJiri Malak2014-03-241-6/+12
| | | | | | | |