summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-191-1/+1
|
* Merge topic 'findqt4-withqt5'Brad King2013-03-181-0/+7
|\ | | | | | | | | 252bfd3 FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes.
| * FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes.Clinton Stimpson2013-03-181-0/+7
| |
* | Merge topic 'fix-FPHSA-match'Brad King2013-03-181-1/+1
|\ \ | | | | | | | | | | | | 78e6217 FPHSA: Fix FOUND_VAR check to work with if() auto-dereference
| * | FPHSA: Fix FOUND_VAR check to work with if() auto-dereferenceStephen Kelly2013-03-181-1/+1
| | | | | | | | | | | | Otherwise, it seems to match on the content of the variable.
* | | 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 'set-QT_MAJOR_VERSION'Brad King2013-03-188-0/+36
|\ \ \ | | | | | | | | | | | | | | | | 4aa10cd FindQt4: Set the INTERFACE_QT_MAJOR_VERSION for Qt4::QtCore
| * | | FindQt4: Set the INTERFACE_QT_MAJOR_VERSION for Qt4::QtCoreStephen Kelly2013-03-188-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With a similar commit in Qt 5, this will error at CMake time if an attempt is made to use target_link_libraries(foo Qt4::QtCore Qt5::Core)
* | | | Merge topic 'set-Qt4_FOUND'Brad King2013-03-181-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 28d14f9 FindQt4: Set the Qt4_FOUND variable if Qt4 is found
| * | | | FindQt4: Set the Qt4_FOUND variable if Qt4 is foundStephen Kelly2013-03-181-3/+5
| |/ / / | | | | | | | | | | | | Provide the old QT4_FOUND for compatibility.
* | | | Merge topic 'TI_DSP_to_TI'Brad King2013-03-1811-47/+68
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | TI compiler: add automatic detection of prefix and suffixesAlex Neundorf2013-03-143-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TI cross compilers are named e.g. cl6x or armcl, the accompanying strip and ar have the same prefixes/suffixes. Alex
| * | | | rename TI_DSP toolchain to TI, since it works also for the ARM compilerAlex Neundorf2013-03-148-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally, look for a special ar and strip Alex
| * | | | Determine C/CXX/Fortran compiler: fix indentationAlex Neundorf2013-03-143-30/+30
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Determine C/CXX/Fortran compiler: minor restructuringAlex Neundorf2013-03-143-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No functional changes, only change the way the if()-condition works, to make it easier to add more cases. Alex
* | | | | Merge topic 'FindCUDA.cmake/SeparableCompilation'Brad King2013-03-181-13/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b6e9b8f FindCUDA: Use the PRE_LINK mode only for MSVC >= 10
| * | | | | FindCUDA: Use the PRE_LINK mode only for MSVC >= 10James Bigler2013-03-141-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use normal custom command dependencies by default. Use the PRE_LINK approach only to work around what seems to be a bug in msbuild handling of custom build rules that chain together.
* | | | | | 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
| |/ / |/| |
* | | Merge topic 'configure-no-tests'Brad King2013-03-141-2/+2
|\ \ \ | | | | | | | | | | | | | | | | dd8a06b Configure Tests/CMakeTests only with BUILD_TESTING ON
| * | | Configure Tests/CMakeTests only with BUILD_TESTING ONBrad King2013-03-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e03f83f3 (ProcessorCount test: fix path to cmsysTestsCxx executable, 2013-01-24) the directory references a target that is not built when BUILD_TESTING is OFF. It makes no sense to add tests without BUILD_TESTING anyway. While at it, use add_subdirectory instead of subdirs to add CMakeTests.
* | | | Merge topic 'aix-pic'Brad King2013-03-141-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5c8c1d6 XL: Use -qpic for position independent code (#14010)
| * | | | XL: Use -qpic for position independent code (#14010)Brad King2013-03-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to XL C/C++ V9.0 documentation the default for -qpic/-qnopic is platform-dependent. It won't hurt to add the option on platforms where it is the default, so always add it when we want position independent code.
* | | | | 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 'findqt4-withqt5'Brad King2013-03-131-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | 161a793 FindQt4: Fix QT_QMAKE{_QMAKE => }_EXECUTABLE typo
| * | | | FindQt4: Fix QT_QMAKE{_QMAKE => }_EXECUTABLE typoBrad King2013-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parent commit accidentally referenced QT_QMAKE_QMAKE_EXECUTABLE which does not exist. Use QT_QMAKE_EXECUTABLE instead. Reported-by: m.hergarden@euphoria-it.nl
* | | | | 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-1317-60/+116
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | CTest: Fail early without PROJECT_BINARY_DIR (#14005)Brad King2013-03-127-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use PROJECT_BINARY_DIR before it is defined. If it is not defined when needed, fail with an error message suggesting that the project() command be invoked first.
| * | | | | | build_command: Fail early without CMAKE_MAKE_PROGRAM (#14005)Brad King2013-03-126-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Refactor RunCMake.build_command test to allow more casesBrad King2013-03-125-59/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the ErrorsOFF/ON common logic from CMakeLists.txt into an ErrorsCommon file to allow other test cases to be added that do not use the Errors test logic.
* | | | | | | Merge topic 'fix-automoc-no-qt'Brad King2013-03-136-15/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-126-15/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-134-0/+24
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f3bb8b Add $<SEMICOLON> generator expression.
| * | | | | | | | | Add $<SEMICOLON> generator expression.Jean-Christophe Fillion-Robin2013-03-124-0/+24
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This expression is useful to put a ';' in a command line argument without dividing the argument during CMake list expansion.
* | | | | | | | | Merge topic 'ExternalData-escape-semicolons'Brad King2013-03-1310-5/+69
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1823ab4 ExternalData: Preserve escaped semicolons during argument expansion
| * | | | | | | | | ExternalData: Preserve escaped semicolons during argument expansionBrad King2013-03-1210-5/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CMake language implicitly flattens lists so a ";" in a list element must be escaped with a backslash. List expansion removes backslashes escaping semicolons to leave raw semicolons in the values. Teach ExternalData_Add_Test and ExternalData_Expand_Arguments to re-escape semicolons found in list elements so the resulting argument lists work as if constructed directly by the set() command. For example: ExternalData_Add_Test(Data NAME test1 COMMAND ... "a\\;b") ExternalData_Expand_Arguments(Data args2 "c\\;d") add_test(NAME test2 COMMAND ... ${args2}) should be equivalent to set(args1 "a\\;b") add_test(NAME test1 COMMAND ... ${args1}) set(args2 "c\\;d") add_test(NAME test2 COMMAND ... ${args2}) which is equivalent to add_test(NAME test1 COMMAND ... "a;b") add_test(NAME test2 COMMAND ... "c;d") Note that it is not possible to make ExternalData_Add_Test act exactly like add_test when quoted arguments contain semicolons because the CMake language flattens lists when constructing function ARGN values. This re-escape approach at least allows test arguments to have semicolons. While at it, teach ExternalData APIs to not transform "DATA{...;...}" arguments because the contained semicolons are non-sensical. Suggested-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
* | | | | | | | | | Merge topic 'add_subdirectory-trailing-slashes'Brad King2013-03-131-5/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1df4928 add_subdirectory: Compute output dir with consistent slashes (#10072)