summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindGTest: Teach GTEST_ADD_TESTS about TEST_PJack Morrison2014-04-011-2/+10
| | | | | | | | | | | | | Previously the GTEST_ADD_TESTS function would miss parameterized tests because it only considered TEST and TEST_F. Add TEST_P to the list of considered tests and will run all instantiations of this parameterized test together. This is perhaps not as correct as searching for all instantiations of this parameterized test and separating those into separate runs, but this will at least run tests that were previously missing. For reference: https://code.google.com/p/googletest/wiki/Documentation
* 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
| | | | | |
* | | | | | Merge topic 'FindPkgConfig-stop-on-missing'Brad King2014-03-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63a4c0af FindPkgConfig: Stop processing when REQUIRED package not found (#14381)
| * | | | | | FindPkgConfig: Stop processing when REQUIRED package not found (#14381)Christoph GrĂ¼ninger2014-03-241-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Make the behavior similar to find_package.
* | | | | | Merge topic 'dev/custom-ninja-deptypes'Brad King2014-03-262-0/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9523d2a5 ninja: Add support for custom depfile formats
| * | | | | | ninja: Add support for custom depfile formatsBen Boeckel2014-03-242-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not everything that isn't MSVC is GCC. I have support for LDC's depfile format on its way upstream[1], but its future is uncertain. CMake should at least support this for future depfile formats. [1]https://github.com/martine/ninja/pull/721
* | | | | | | Merge topic 'remove-CMakeFiles-advice'Brad King2014-03-261-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bccc056b cmake: Advise user to remove CMakeFiles with CMakeCache.txt (#14820)
| * | | | | | | cmake: Advise user to remove CMakeFiles with CMakeCache.txt (#14820)Brad King2014-03-211-4/+4
| | | | | | | |
* | | | | | | | Merge topic 'haiku-updates'Brad King2014-03-263-11/+54
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0cc42b87 Haiku: Fix compiler detection when using distcc 84603d80 Haiku: Enable CMake builtin ELF editor
| * | | | | | | | Haiku: Fix compiler detection when using distccAdrien Destugues2014-03-211-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove outdated include directories.
| * | | | | | | | Haiku: Enable CMake builtin ELF editorAdrien Destugues2014-03-212-0/+38
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Co-Author: Brad King <brad.king@kitware.com>
* | | | | | | | Merge topic 'fix-Qt4-moc-commands-depends'Brad King2014-03-265-1/+58
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 734df96f Qt4: Fix moc command dependencies for incremental build.
| * | | | | | | | Qt4: Fix moc command dependencies for incremental build.Stephen Kelly2014-03-215-1/+58
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.12~327^2 (Qt4Macros: Allow specifying a TARGET in invokations of macros., 2013-02-26), a parameters file is populated with moc arguments at generate-time. When the compile definitions or include directories change, the parameters file is updated but moc is not re-run in response. Fix that by making the moc invocation depend on the parameters file. Reported-At: https://bugreports.qt-project.org/browse/QTBUG-36970
* | | | | | | | Merge topic 'report-INTERFACE-type-in-conflict'Brad King2014-03-261-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f1fd3714 cmMakefile: Report type of INTERFACE library in conflict.
| * | | | | | | | cmMakefile: Report type of INTERFACE library in conflict.Stephen Kelly2014-03-201-0/+3
| |/ / / / / / /
* | | | | | | | Merge topic 'UseJava-fix-resource-copy'Brad King2014-03-261-3/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2abd8efe UseJava: Copy resource files before compiling the jar (#13360)
| * | | | | | | | UseJava: Copy resource files before compiling the jar (#13360)Bruno Nova2014-03-201-3/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Co-Author: Mary Ellen Foster <mefoster@gmail.com>
* | | | | | | | Merge topic 'update-kwsys'Brad King2014-03-261-4/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed6ddb89 Merge branch 'upstream-kwsys' into update-kwsys 12faf00d KWSys 2014-03-19 (a8aa1014)
| * \ \ \ \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-03-201-4/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | KWSys 2014-03-19 (a8aa1014)KWSys Robot2014-03-201-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ a8aa1014 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' dd873734..a8aa1014 Gerhard Grimm (1): fa86f1ba SystemInformation: Fix HP-UX PA-RISC processor detection Rolf Eike Beer (1): a8aa1014 SystemInformation: Fix HP-UX Intel processor detection Change-Id: I5891a6898cc73caf1b2be98859d5d4b11a24c5df
* | | | | | | | | Merge topic 'compile-m-as-c'Brad King2014-03-262-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95cdf132 Treat .m files consistently as C across all generators
| * | | | | | | | | Treat .m files consistently as C across all generatorsTim Blechmann2014-03-202-2/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Objective C sources should be compiled with the C compiler, not C++. The Xcode generator correctly classifies ".m" sources already. The cmSystemTools::GetFileFormat method was fixed by commit v2.8.0~1782 (fix for 7045, use gcc for .m, 2008-08-19) but it is not used by any of the generator since commit v2.4.0~2819 (major changes to support addition of languages, 2004-09-22). Fix the CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS table entries so that cmGlobalGenerator::GetLanguageFromExtension tells the Makefile, Ninja, and VS IDE generators to compile ".m" sources as C. This makes behavior consistent on all generators. Signed-off-by: Tim Blechmann <tim@klingt.org>
* | | | | | | | | Merge topic 'UseSWIG-revert-bad-fix-0010080'Brad King2014-03-261-4/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9760647 Revert "UseSWIG: Name extra generated files after module name (#10080)"
| * | | | | | | | | Revert "UseSWIG: Name extra generated files after module name (#10080)"Julien Schueller2014-03-201-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f0111deb1ea21f667b2fbf57f55d5ee2a80f5ccc.
* | | | | | | | | | Merge branch 'release'Brad King2014-03-260-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | CMake 3.0.0-rc3v3.0.0-rc3Brad King2014-03-201-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |