summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'update-kwsys'Brad King2013-03-252-1/+7
|\ | | | | | | | | | | 3ed2d03 Merge branch 'upstream-kwsys' into update-kwsys 83a9f09 KWSys 2013-03-21 (2d263bc3)
| * Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-03-222-1/+7
| |
* | Merge topic 'cpack-printf-format-warnings'Brad King2013-03-251-4/+4
|\ \ | | | | | | | | | | | | 0fca154 CPack: Avoid "format expects 'unsigned int'" warnings
| * | CPack: Avoid "format expects 'unsigned int'" warningsPaul Kunysch2013-03-221-4/+4
| |/ | | | | | | | | Cast sprintf uid and gid arguments to match the type expected by their "%-6u" format strings.
* | Merge topic 'doc-string-regex'Brad King2013-03-251-2/+2
|\ \ | | | | | | | | | | | | 763a6dc string: Fix regex documentation of '^' and '$' (#14028)
| * | string: Fix regex documentation of '^' and '$' (#14028)Brad King2013-03-191-2/+2
| | | | | | | | | | | | | | | | | | They match at the beginning and end of the input, not by line. Reported-by: Martin Perzl <martin.perzl@web.de>
* | | CMake Nightly Date StampKitware Robot2013-03-251-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2013-03-241-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2013-03-231-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2013-03-221-1/+1
| |/ |/|
* | CMake Nightly Date StampKitware Robot2013-03-211-1/+1
| |
* | CMake Nightly Date StampKitware Robot2013-03-201-1/+1
| |
* | Merge topic 'automoc-append-implicit-dirs'Brad King2013-03-191-13/+24
|\ \ | | | | | | | | | | | | 753b905 Automoc: append implicit includes after user-specified dirs
| * | Automoc: append implicit includes after user-specified dirsStephen Kelly2013-03-191-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit d2536579 (Automoc: fix regression #13667, broken build in phonon, 2012-11-19) changed Automoc to try to re-add the Qt header dir if it was stripped out as an implicit include from the moc command line. When invoking a compiler, those directories are stripped out because they are built-in, but for moc, there are no built-in directories. The follow-up commit acc22400 (Automoc: get include dirs without stripping implicit include dirs off, 2012-12-07) went further by not removing the implicit include dirs, if they were specified specifically by the user. This had the remaining problem that the implicit include dirs appeared in a different order of precedence for moc compared to the compiler. Resolve that by stripping out the include dirs, where specified for the moc command line to, and then appending them at the end. Note that the order of the appended implicit include directories is the order they are specified in the CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES, not the order specified by the user.
* | | Merge topic 'expand-version-of-Qt5-gui-fix'Brad King2013-03-191-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 6387f6d cmake-gui: Use the QStandardItemModel workaround until 5.1.0.
| * | | cmake-gui: Use the QStandardItemModel workaround until 5.1.0.Stephen Kelly2013-03-191-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is a Qt 5.0.3 release, it may or may not contain the patch that fixes this issue. http://thread.gmane.org/gmane.comp.lib.qt.releasing/882 Just use the workaround until 5.1.0 which certainly will contain the fix. Don't use the workaround before Qt 5.0.0.
* | | Merge topic 'fix-genex-preprocess'Brad King2013-03-191-2/+22
|\ \ \ | |_|/ |/| | | | | | | | 7a619fa Fix cmGeneratorExpression::Preprocess for interleaved inputs.
| * | Fix cmGeneratorExpression::Preprocess for interleaved inputs.Stephen Kelly2013-03-181-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't find both preprocessing expressions at once, because then the BUILD_INTERFACE will always be favored if both are present, even if INSTALL_INTERFACE appears first. This was affecting the behavior of install(EXPORT) because the INTERFACE_INCLUDE_DIRECTORIES contained entries like /foo/include;$<INSTALL_INTERFACE:/bar/include> As the INSTALL_INTERFACE always evaluates to '0', it always needs to be preprocessed properly.
* | | CMake Nightly Date StampKitware Robot2013-03-191-1/+1
| | |
* | | Merge topic 'CMAKE_AUTOMOC-Qt5-docs'Brad King2013-03-181-1/+2
|\ \ \ | | | | | | | | | | | | | | | | 1b386b3 Document that CMAKE_AUTOMOC works with Qt 5.
| * | | Document that CMAKE_AUTOMOC works with Qt 5.Stephen Kelly2013-03-161-1/+2
| | | |
* | | | Merge topic 'TI_DSP_to_TI'Brad King2013-03-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27e6f6e TI compiler: add automatic detection of prefix and suffixes b301586 rename TI_DSP toolchain to TI, since it works also for the ARM compiler 12b25df Determine C/CXX/Fortran compiler: fix indentation 7baa55a Determine C/CXX/Fortran compiler: minor restructuring
| * | | | rename TI_DSP toolchain to TI, since it works also for the ARM compilerAlex Neundorf2013-03-141-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | Additionally, look for a special ar and strip Alex
* | | | CMake Nightly Date StampKitware Robot2013-03-181-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2013-03-171-1/+1
| |/ |/|
* | CMake Nightly Date StampKitware Robot2013-03-161-1/+1
| |
* | CMake Nightly Date StampKitware Robot2013-03-151-1/+1
|/
* CMake Nightly Date StampKitware Robot2013-03-141-1/+1
|
* Merge topic 'ninja-escape-line-breaks'Brad King2013-03-131-0/+1
|\ | | | | | | | | 3b4436a Ninja: escape line breaks in literals
| * Ninja: escape line breaks in literalsPeter Kümmel2013-03-091-0/+1
| | | | | | | | BUG: 13591
* | Merge topic 'qt5-fixes'Brad King2013-03-132-1/+7
|\ \ | | | | | | | | | | | | | | | 404e1d6 cmake-gui: Workaround bug in Qt 5.0.0 to 5.0.3 QStandardItemModel 5144f6f cmake-gui: Use -fPIE if required by Qt.
| * | cmake-gui: Workaround bug in Qt 5.0.0 to 5.0.3 QStandardItemModelStephen Kelly2013-03-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | The commit in qtbase 9dfba89c (Add implementations of QAIM::sibling in public APIs., 2012-09-26) added a buggy implementation of sibling(), and the commit f136701b (Use the base implementation of QAbstractItemModel::sibling in QSIM., 2013-02-21) resolves it. Workaround the bug for Qt releases that have it.
| * | cmake-gui: Use -fPIE if required by Qt.Stephen Kelly2013-03-121-0/+2
| | |
* | | Merge topic 'cleanup-early-include-CTest-failure'Brad King2013-03-131-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d90f49b CTest: Fail early without PROJECT_BINARY_DIR (#14005) 2e1c2bd build_command: Fail early without CMAKE_MAKE_PROGRAM (#14005) 4e5cb37 Refactor RunCMake.build_command test to allow more cases
| * | | build_command: Fail early without CMAKE_MAKE_PROGRAM (#14005)Brad King2013-03-121-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | If CMAKE_MAKE_PROGRAM is not set fail with an error message instead of crashing. Suggest calling project() or enable_language() first to ensure that CMAKE_MAKE_PROGRAM is set.
* | | | Merge topic 'fix-automoc-no-qt'Brad King2013-03-133-15/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | a223a3b Automoc: Don't create automoc targets if Qt is not used (#13999) 65b5c1e Merge branch 'property-link-depends-no-crash' into fix-automoc-no-qt
| * | | | Automoc: Don't create automoc targets if Qt is not used (#13999)Stephen Kelly2013-03-123-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 79568f95 (automoc: Add source file to target early to set the linker language, 2013-02-20) changed automoc initialization to a two step process. In the first step, the generated source file was added to the target, which allows the link language to be determined. However, this bypassed the check for the availability of Qt itself. At build-time the automoc file could not be generated because the moc tool was not available to create it. The solution is to only add the automoc file to the target if Qt is found.
| * | | | Merge branch 'property-link-depends-no-crash' into fix-automoc-no-qtBrad King2013-03-121-0/+8
| |\ \ \ \
* | \ \ \ \ Merge topic 'property-link-depends-no-crash'Brad King2013-03-131-0/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | ab079ee Avoid crash when checking property compatibility without link info 92a2ab7 Avoid crash when checking property link dependencies without link info
| * | | | | Avoid crash when checking property compatibility without link infoBrad King2013-03-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the compatibility check added by commit 042ecf04 (Add API to calculate link-interface-dependent bool properties or error, 2013-01-06) to return early if no link information is available. This avoids crashing in a case that should fail with an error message.
| * | | | | Avoid crash when checking property link dependencies without link infoBrad King2013-03-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the isLinkDependentProperty helper added by commit e9879910 (Make INTERFACE determined properties readable in generator expressions, 2013-01-19) to return early if no link information is available.
* | | | | | Merge topic 'genex-SEMICOLON'Brad King2013-03-132-0/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f3bb8b Add $<SEMICOLON> generator expression.
| * | | | | | Add $<SEMICOLON> generator expression.Jean-Christophe Fillion-Robin2013-03-122-0/+20
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | This expression is useful to put a ';' in a command line argument without dividing the argument during CMake list expansion.
* | | | | | Merge topic 'add_subdirectory-trailing-slashes'Brad King2013-03-131-5/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1df4928 add_subdirectory: Compute output dir with consistent slashes (#10072)
| * | | | | | add_subdirectory: Compute output dir with consistent slashes (#10072)Brad King2013-03-121-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the command is invoked without an explicit build directory path we compute it from the source directory path. When either the source or build tree is the root of a Windows drive letter it will have a trailing slash. Handle slashes consistently when substituting the current output directory for the current source directory. While at it, use cmSystemTools::IsSubDirectory instead of FindLastString to verify that the source directory is a subdirectory. Inspired-by: Graham Menhennitt <graham@menhennitt.com.au>
* | | | | | | Merge topic 'doc-fixes'Brad King2013-03-134-3/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3cf2f67 Documentation: Clarify a few subtleties
| * | | | | | | Documentation: Clarify a few subtletiesPetr Kmoch2013-03-124-3/+24
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clarify accepted values of <LANG> suffix in CMAKE_COMPILER_IS_GNU<LANG>. * Clarify fact that target property GENERATOR_FILE_NAME usually cannot be used at configure time. * Clarify that enable_language() can only be used in global scope of top-level project using language. * State that enable_language(... OPTIONAL) currently doesn't work. * Document regular expression operator precedence.
* | | | | | | CMake Nightly Date StampKitware Robot2013-03-131-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'ninja-mingw-lang'Brad King2013-03-124-86/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2271ca3 Ninja: the Ninja generator does not support Fortran yet. 751f712 Ninja: use MinGW generator code in EnableLanguage()
| * | | | | | Ninja: the Ninja generator does not support Fortran yet.Peter Kümmel2013-03-101-5/+11
| | |_|_|_|/ | |/| | | |