summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-12441-show-custom-target-progress'David Cole2011-12-161-0/+14
|\ | | | | | | | | 7ab1162 CMake: Fix progress reporting for custom targets (#12441)
| * CMake: Fix progress reporting for custom targets (#12441)Johan Fänge2011-12-141-0/+14
| | | | | | | | | | | | Adds "include progress.make" to build.make, just like for add_executable and add_library targets. The code was copied from cmMakefileTargetGenerator::WriteCommonCodeRules().
* | Merge topic 'fix-12480-correct-windres-compiler-when-cross-compiling'David Cole2011-12-161-0/+3
|\ \ | | | | | | | | | | | | 6ddb1e5 Modules: Use "windres" as rc compiler base name for cross-compiles (#12480)
| * | Modules: Use "windres" as rc compiler base name for cross-compiles (#12480)David Cole2011-12-141-0/+3
| |/ | | | | | | | | | | | | ...if it matches "windres", as opposed to being exactly equal to "windres" Cross-compiling windres compilers are named something like "i686-w64-mingw32-windres" (for example)
* | Merge topic 'vs-version-ivar'David Cole2011-12-161-0/+10
|\ \ | | | | | | | | | | | | 6571f46 Fix Intel Fortran .vfproj files for VS 10
| * | Fix Intel Fortran .vfproj files for VS 10Brad King2011-12-131-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 1be4b6f4 (Order VS local generator Version ivar values consistently, 2011-11-10) fixed the Version ivar of the VS 10 local generator by setting it correctly to 10 instead of leaving it at 7. This broke generation of .vfproj files for the Intel Fortran plugin to VS 10 by mixing VS 9 and 10 formats together in one file. Teach the local generator to pretend the Version is 9 for Intel Fortran targets.
* | | Merge topic 'fix-lapack-issues'David Cole2011-12-161-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | b3c42cb FindLAPACK: List thread libs to avoid link errors (#12625) f603cf2 FindLAPACK: Correct CMAKE_FIND_LIBRARY_SUFFIXES spelling (#12624)
| * | | FindLAPACK: List thread libs to avoid link errors (#12625)Tim Gallagher2011-12-131-1/+1
| | | |
| * | | FindLAPACK: Correct CMAKE_FIND_LIBRARY_SUFFIXES spelling (#12624)Tim Gallagher2011-12-131-4/+4
| | |/ | |/|
* | | Merge topic 'qt4-deploy-module'David Cole2011-12-161-0/+2
|\ \ \ | | | | | | | | | | | | | | | | 4e9274e Unset configurations variable when no build type.
| * | | Unset configurations variable when no build type.Mike McQuaid2011-12-131-0/+2
| | | |
* | | | Merge topic 'CPackRPM-0012608-UserSpecificFileControl'David Cole2011-12-161-10/+89
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 121c295 CPackRPM fix #0012608 and unoticed related bug
| * | | | CPackRPM fix #0012608 and unoticed related bugEric NOULARD2011-12-121-10/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The User may now specific a list of file that shouldn't be automatically handled by CPack but specified by the user. Like %config(noreplace) or specific %attr. The concerned files/dir lines will be removed from the set automatically handled by CPack.
* | | | | Merge topic 'ctest-no-cdash-issue-12618'David Cole2011-12-161-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 52f937a CTest: Do not get CDash version without drop site (#12618)
| * | | | | CTest: Do not get CDash version without drop site (#12618)Valat Sébastien2011-12-121-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Avoid sleep for 3 seconds in ctest if CDashDropSite is empty.
* | | | | | Merge topic 'xcode-rerun-issue-12616'David Cole2011-12-161-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8b8f0e Xcode: Create separate rerun dependencies for subprojects (#12616)
| * | | | | | Xcode: Create separate rerun dependencies for subprojects (#12616)Brad King2011-12-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate the rerun dependency file for the top-level project() and each subdirectory project() into the corresponding build directory. Do not clobber them all with the one for the last subproject. This mistake was left from when the Xcode generator did not produce subprojects.
* | | | | | | Merge topic 'FortranCInterface-MinGW'David Cole2011-12-161-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4cb73c4 FortranCInterface: Work around mingw32-make trouble with parens
| * | | | | | | FortranCInterface: Work around mingw32-make trouble with parensBrad King2011-12-091-0/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mingw32-make tool does not handle parenthesis in the path to a source file consistently. When CMake is installed in a typical location like "c:\Program Files (x86)\CMake 2.8\" the mingw32-make tool fails on the FortranCInterface detection project sometimes with errors like >mingw32-make -f CMakeFiles\myfort.dir\build.make CMakeFiles/myfort.dir/my_module.f90.obj mingw32-make: *** No rule to make target `x86)/CMake 2.8/share/cmake-2.8/Modules/FortranCInterface/my_module.f90)', needed by `CMakeFiles/myfort.dir/my_module.f90.obj'. Stop. due to parens in the path to the FortranCInterface source directory. However, the behavior varies with the file name of build.make: >copy CMakeFiles\myfort.dir\build.make CMakeFiles\myfort.dir\build2.make >mingw32-make -f CMakeFiles\myfort.dir\build2.make CMakeFiles/myfort.dir/my_module.f90.obj [ 3%] Building Fortran object CMakeFiles/myfort.dir/my_module.f90.obj Tested with >mingw32-make -v GNU Make 3.82 Built for i386-pc-mingw32 Work around the problem by copying the whole FortranCInterface source directory in to the project build tree.
* | | | | | | Merge topic 'update-cygwin-release-script'David Cole2011-12-161-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61a7da2 Release: Increase timeout for slow-testing cygwin build
| * | | | | | | Release: Increase timeout for slow-testing cygwin buildDavid Cole2011-12-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the ExternalProject test was timing out at the default timeout value of 1500 seconds. Give it time, little one, it will finish if you learn patience.
* | | | | | | | KWSys Nightly Date StampKWSys Robot2011-12-161-1/+1
| | | | | | | |
* | | | | | | | KWSys: Correctly handle empty environment variablesBrad King2011-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a crash which occurs when SystemTools::GetPath attempts to process an empty environment variable. Author: Vladimir Panteleev <vladimir@thecybershadow.net>
* | | | | | | | KWSys Nightly Date StampKWSys Robot2011-12-151-1/+1
| | | | | | | |
* | | | | | | | KWSys Nightly Date StampKWSys Robot2011-12-141-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | KWSys Nightly Date StampKWSys Robot2011-12-131-1/+1
| |_|/ / / / |/| | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2011-12-121-1/+1
| | | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2011-12-111-1/+1
| | | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2011-12-101-1/+1
|/ / / / /
* | | | | KWSys Nightly Date StampKWSys Robot2011-12-091-1/+1
|/ / / /
* | | | KWSys Nightly Date StampKWSys Robot2011-12-081-1/+1
| | | |
* | | | Merge topic 'AutomocIncludedDotMocFileHandling'David Cole2011-12-0721-73/+790
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d11951 Merge branch 'master' into AutomocIncludedDotMocFileHandling 1eca18f automoc: add documentation for CMAKE_AUTOMOC_STRICT_MODE bc278ce automoc: fix line length 62e223e automoc: add variable CMAKE_AUTOMOC_STRICT_MODE, to enable strict parsing 40c5167 automoc: accept even more .moc files in non-strict mode c207f5d automoc: also accept other files when .moc is included in non-strict mode 9c0df72 automoc: add a StrictParseCppFile(), which is only qmake-compatible 174bf35 automoc: move the code for finding headers into separate function 8507eae automoc: fix handling of included _p.moc files 7ada172 automoc: some more linebreaks for the warnings for better readability 3b93e26 automoc: add extra check whether the header contains Q_PRIVATE_SLOT 4745715 Add a test case for the use of Q_PRIVATE_SLOT. bde4edb automoc: add special handling for including basename_p.moc, with test 74ab0f6 automoc: move some code from the big parsing loop into separate functions bc7560e automoc: add test for including a moc_abc_p.cpp file 30fd8e6 automoc: add test for including the moc file from another header ...
| * \ \ \ Merge branch 'master' into AutomocIncludedDotMocFileHandlingDavid Cole2011-12-07201-567/+7588
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Source/cmTarget.cxx
| * | | | | automoc: add documentation for CMAKE_AUTOMOC_STRICT_MODEAlex Neundorf2011-12-062-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | automoc: fix line lengthAlex Neundorf2011-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | automoc: add variable CMAKE_AUTOMOC_STRICT_MODE, to enable strict parsingAlex Neundorf2011-12-023-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | automoc: accept even more .moc files in non-strict modeAlex Neundorf2011-12-021-56/+25
| | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | automoc: also accept other files when .moc is included in non-strict modeAlex Neundorf2011-12-021-20/+14
| | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | automoc: add a StrictParseCppFile(), which is only qmake-compatibleAlex Neundorf2011-12-022-6/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ParseCppFile() is the one which is automoc4/KDE4-compatible, and which becomes a bit crowded. By separating these two it is easier to ensure that the strict one doesn't get broken accidentially. Alex
| * | | | | automoc: move the code for finding headers into separate functionAlex Neundorf2011-12-022-21/+37
| | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | automoc: fix handling of included _p.moc filesAlex Neundorf2011-11-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | automoc: some more linebreaks for the warnings for better readabilityAlex Neundorf2011-11-291-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | automoc: add extra check whether the header contains Q_PRIVATE_SLOTAlex Neundorf2011-11-291-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is again for KDE4 compatiblity. If foo.moc is included, in general moc should run on foo.cpp. Usually this can't cause problems. It can only cause problems if moc must run on the header, and the resulting file must be included in the cpp file, which is the case with the Q_PRIVATE_SLOT macro. This makes the test added by Stephen pass. Alex
| * | | | | Add a test case for the use of Q_PRIVATE_SLOT.Stephen Kelly2011-11-223-1/+42
| | | | | |
| * | | | | automoc: add special handling for including basename_p.moc, with testAlex Neundorf2011-11-226-8/+124
| | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | automoc: move some code from the big parsing loop into separate functionsAlex Neundorf2011-11-221-30/+47
| | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | automoc: add test for including a moc_abc_p.cpp fileAlex Neundorf2011-11-222-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | automoc: add test for including the moc file from another headerAlex Neundorf2011-11-225-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including moc_xyz.cpp in abc.cpp should run moc on xyz.h (and include the file in abc.cpp) Alex
| * | | | | automoc: add a test for including both abc.moc and moc_abc.cppAlex Neundorf2011-11-224-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | Automoc: modified handling of included .moc filesAlex Neundorf2011-11-161-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -enable the KDE4-compatiblity mode only when using Qt4 -always (except in the KDE4 compat mode) error out if a cpp-file contains "Q_OBJECT", but does not include filename.moc Alex