summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake 2.8.11-rc1Robert Maynard2013-03-142-3/+558
|
* 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)
| * | | | | | | | | 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 'findqt4-withqt5'Brad King2013-03-121-36/+53
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | 2112341 FindQt4: Do not use qmake from Qt5
| * | | | | | | FindQt4: Do not use qmake from Qt5Janne Rönkkö2013-03-121-36/+53
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wihtout this, if qmake binary is from Qt5 the FindQt4 fails even though the Qt4 version of qmake would be installed as qmake-qt4. On Archlinux this is the case. Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
* | | | | | | Merge topic 'aix-shared-flags'Brad King2013-03-122-2/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | bce7a2a AIX: Do not use -brtl to create shared libraries (#13997)
| * | | | | | AIX: Do not use -brtl to create shared libraries (#13997)Brad King2013-03-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flag was added incorrectly by commit 9c3a6eb4 (Need -brtl when creating shared libraries, 2003-05-16). According to "man ld" the -G option implies "-brtl -bnortllib ...", -brtl implies "-brtllib", and -brtllib should only be used for executables, not shared libraries. Therefore it is incorrect and unnecessary to specify -brtl explicitly after -G. Reported-by: Kevin Burge <kcburge@gmail.com>
* | | | | | | 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
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Ninja: use MinGW generator code in EnableLanguage()Peter Kümmel2013-03-094-84/+38
| | | | | | |
* | | | | | | Merge topic 'install-export-usr-move'Brad King2013-03-122-9/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c727b9 install(EXPORT): Force absolute paths for usr-move
| * | | | | | | install(EXPORT): Force absolute paths for usr-moveBrad King2013-03-082-9/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the absolute install(EXPORT) destination for the CMAKE_INSTALL_PREFIX used during configuration is under (/usr)?/lib(64)? then assume the current build is for a system package installation instead of a relocatable distribution. Generate an absolute path for _IMPORT_PREFIX in the target exports file instead of generating code to compute the value relative to the file location. This is necessary for distributions implementing a move to /usr such as: https://wiki.archlinux.org/index.php/DeveloperWiki:usrlib "All files in the /lib directory have been moved to /usr/lib and now /lib is a symlink to usr/lib." The relative path computation is not reliable because the targets file could be installed through cross-prefix a symlink and loaded without it or vice versa. A similar change was made for package configuration file generation by commit d4774140 (configure_package_config_file: force absolute paths for usr-move, 2013-01-24).
* | | | | | | | Merge topic 'vs7-empty-groups'Brad King2013-03-122-8/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 545fdec VS: Avoid empty source groups in some cases (#3474)
| * | | | | | | | VS: Avoid empty source groups in some cases (#3474)Anton Helwart2013-03-082-8/+22
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the WriteGroup method return true if a group or any of its children have source files. Have children write their output to a temporay cmOStringStream. Add it to the real output only if not empty.
* | | | | | | | Merge topic 'cpack-nsis-no-release-version'Brad King2013-03-121-12/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7947890 CPack: Fix NSIS version check without release version (#9721)
| * | | | | | | | CPack: Fix NSIS version check without release version (#9721)Gerald Hofmann2013-03-081-12/+24
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only check a release version for the minimum required version. If NSIS returns a CVS build version string (as when built by Macports), skip the version check altogether and assume a sufficiently new version. Also correctly handle the case where the version check fails and the CPACK_TOPLEVEL_DIRECTORY option is not set. Co-Author: Graham Menhennitt <graham@menhennitt.com.au>
* | | | | | | | Merge topic 'fix-transitive-target-names'Brad King2013-03-124-3/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bdd167 Restore support for target names with '+' (#13986) 254687d Only process transitive interface properties for valid target names.
| * | | | | | | | Restore support for target names with '+' (#13986)Stephen Kelly2013-03-123-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the range of valid target names with the + sign. This character can commonly be used for target names, such as those containing 'c++'. Add a test but skip it for Borland and Watcom tools which do not support the character. Suggested-By: Benjamin Kloster
| * | | | | | | | Only process transitive interface properties for valid target names.Stephen Kelly2013-03-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit a1c4905f (Use the link information as a source of compile definitions and includes., 2013-02-12) introduced the use of link information as the source of target properties via the TARGET_PROPERTY generator expression. This generator expression has a strict interpretation of a valid target name and emits a fatal error for invalid names. Ensure that only targets with names valid for use with TARGET_PROPERTY or targets which are determined by generator expressions are processed by it. This means that at worst, invalid target names do not participate in the transitive evaluation of properties, but the validation generator expression can be extended where needed to resolve that.
* | | | | | | | | Merge topic 'clean-target_link_libraries-test'Brad King2013-03-123-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adcc00b Remove unused parameters from target_link_libraries tests.
| * | | | | | | | | Remove unused parameters from target_link_libraries tests.Stephen Kelly2013-03-063-3/+3
| |/ / / / / / / /