summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: Fix xref typos in target_compile_options docsBrad King2015-03-311-2/+2
| | | | Fix links to the COMPILE_OPTIONS directory and target properties.
* Help: Add link target to cmake-language.7 lists sectionBrad King2015-03-311-0/+2
|
* Merge topic 'cpack-archive-prefix'Brad King2015-03-305-0/+51
|\ | | | | | | | | e3f84fc5 cpack: Fix CPACK_PACKAGING_INSTALL_PREFIX handling for archives (#14677)
| * cpack: Fix CPACK_PACKAGING_INSTALL_PREFIX handling for archives (#14677)Clinton Stimpson2015-03-305-0/+51
| | | | | | | | | | Fix the case when the archive generator is used to package components with an install prefix.
* | Merge topic 'add_dependencies-INTERFACE-libraries'Brad King2015-03-3010-35/+32
|\ \ | | | | | | | | | | | | | | | ac14cbf0 Allow add_dependencies() on INTERFACE libraries (#15414) 817d31db Help: Format add_dependencies documentation
| * | Allow add_dependencies() on INTERFACE libraries (#15414)Brad King2015-03-2710-28/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.0.0-rc1~175^2~20 (add_dependencies: Disallow use with INTERFACE_LIBRARY, 2013-12-25). Teach our dependency analysis to transitively follow INTERFACE target utility dependencies as was done or IMPORTED targets in commit v2.8.6~127^2~1 (Allow add_dependencies() on imported targets, 2010-11-19). Extend the InterfaceLibrary test with a case to cover header generation for a header-only INTERFACE library via a custom target.
| * | Help: Format add_dependencies documentationBrad King2015-03-271-9/+12
| | | | | | | | | | | | Add reStructuredText markup.
* | | Merge topic 'ninja-autogen'Brad King2015-03-301-3/+6
|\ \ \ | | | | | | | | | | | | | | | | 4d08e6b6 QtAutogen: Fix rcc rebuild with Ninja generator (#15459)
| * | | QtAutogen: Fix rcc rebuild with Ninja generator (#15459)Brad King2015-03-271-3/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The rcc outputs are byproducts of the cmake_autogen rule, not outputs. We still must run cmake_autogen on every run even if the rcc outputs exist. Ninja requires explicit byproduct specification, which is now possible in CMake since commit v3.2.0-rc1~340^2~2 (Add an option for explicit BYPRODUCTS of custom commands, 2014-11-13). Revise the logic introduced by commit v3.2.0-rc1~480^2 (QtAutogen: Regenerate qrc files if their input changes, 2014-09-17) to specify byproducts explicitly.
* | | Merge topic 'ExternalData-recursive-match'Brad King2015-03-3023-7/+84
|\ \ \ | | | | | | | | | | | | | | | | | | | | 230f2d6e ExternalData: Add option to recursively match under directories 564c07f7 ExternalData: Parameterize internal file(GLOB) operation selection
| * | | ExternalData: Add option to recursively match under directoriesBrad King2015-03-2723-3/+76
| | | | | | | | | | | | | | | | | | | | | | | | Extend the ``DATA{Dir/,...}`` syntax with a new ``RECURSE:`` option to enable recursive matching of associated files. This will allow an entire directory tree of data to be referenced at once.
| * | | ExternalData: Parameterize internal file(GLOB) operation selectionBrad King2015-03-271-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | Extend the _ExternalData_arg_find_files signature with an option to specify the kind of file(GLOB) operation to be performed. Set CMP0009 to NEW so that GLOB_RECURSE does not follow symlinks.
* | | | Merge topic 'xcode-default-ARCHS'Brad King2015-03-302-41/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | b76b52c0 Xcode: Set ARCHS only when CMAKE_OSX_ARCHITECTURES is specified (#14736) 9e14a5de cmGlobalXCodeGenerator: Simplify ARCHS list with cmJoin
| * | | | Xcode: Set ARCHS only when CMAKE_OSX_ARCHITECTURES is specified (#14736)Brad King2015-03-272-32/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the Xcode generator that ONLY_ACTIVE_ARCH=YES means to use ARCHS, and that the default of ONLY_ACTIVE_ARCH=NO means to use NATIVE_ARCH and ignore ARCHS. In the latter case there is no reason to generate ARCHS.
| * | | | cmGlobalXCodeGenerator: Simplify ARCHS list with cmJoinBrad King2015-03-271-10/+2
| | |/ / | |/| |
* | | | Merge topic 'wix-fix-utf8'Brad King2015-03-303-4/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 98a3b2e2 CPackWIX: Omit codepage conversion when internal encoding is already UTF-8.
| * | | | CPackWIX: Omit codepage conversion when internal encoding is already UTF-8.Nils Gladitz2015-03-273-4/+10
| | | | |
* | | | | Merge topic 'clean-scanbuild-warnings'Brad King2015-03-307-31/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e680d43d Fix an unused variable warning from scanbuild. a4a1b729 Fix warnings from clang scanbuild.
| * | | | | Fix an unused variable warning from scanbuild.Bill Hoffman2015-03-261-10/+1
| | | | | |
| * | | | | Fix warnings from clang scanbuild.Bill Hoffman2015-03-256-21/+32
| | |_|_|/ | |/| | |
* | | | | CMake Nightly Date StampKitware Robot2015-03-301-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-03-291-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-03-281-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'fix-external-project-generator'Brad King2015-03-271-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | a704098d ExternalProject: fix the build command for generator overrides
| * | | | ExternalProject: fix the build command for generator overridesBen Boeckel2015-03-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `binary_dir` variable is never set, so this is invalid. Instead, use "." which all the other build commands use anyways. Also only set the --config option if it is meaningful.
* | | | | Merge topic 'wix-external-expat'Brad King2015-03-271-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 86037915 CPackWIX: Add static_casts for XML_Parser.
| * | | | | CPackWIX: Add static_casts for XML_Parser.Nils Gladitz2015-03-261-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "XML_Parser" in cmexpat is a typedef for void* while newer releases of expat seem to use struct XML_ParserStruct *XML_Parser. Add static_casts so that the build works with either variant.
* | | | | Merge topic 'FindMFC-CMP0054'Brad King2015-03-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dcf29800 FindMFC: Use if(DEFINED) to simplify condition (#15477)
| * | | | | FindMFC: Use if(DEFINED) to simplify condition (#15477)Brad King2015-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace an old hack of the form 'if("${VAR}" MATCHES "^${VAR}$")' with the much simpler 'if(NOT DEFINED ${VAR})'. This was exposed by a CMP0054 warning.
* | | | | | Merge topic 'Fortran-GNU-no-isystem'Brad King2015-03-271-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8e7a104 GNU: Do not use -isystem with gfortran
| * | | | | | GNU: Do not use -isystem with gfortranBrad King2015-03-261-0/+3
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compiler documents that USE statements search for ".mod" files in directories specified with -I, but not -isystem. Reported-by: Hugh Sorby <h.sorby@auckland.ac.nz>
* | | | | | Merge topic 'curl-cygwin-no-windows'Brad King2015-03-271-2/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a2ff2b7 curl: Never consider using Windows APIs on Cygwin
| * | | | | | curl: Never consider using Windows APIs on CygwinBrad King2015-03-261-2/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our Windows API header checks are conditioned on if(NOT UNIX) but libarchive checks HAVE_WINDOWS_H anyway so the result leaks into the cache and influenes the curl build. Set the check results to false explicitly for curl when not on Windows to tolerate this. Reported-by: Vyacheslav Karpukhin <Vyacheslav.Karpukhin@jetbrains.com>
* | | | | | Merge topic 'qtdialog-cpack-qt5-osx'Brad King2015-03-271-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | 9c76ff01 QtDialog: Fix CMake packaging with CPack on OS X with Qt5.
| * | | | | QtDialog: Fix CMake packaging with CPack on OS X with Qt5.Clinton Stimpson2015-03-251-2/+2
| | |_|_|/ | |/| | |
* | | | | CMake Nightly Date StampKitware Robot2015-03-271-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2015-03-261-1/+1
| |_|/ |/| |
* | | Merge topic 'file-LOCK-close'Brad King2015-03-252-0/+7
|\ \ \ | | | | | | | | | | | | | | | | 1f289095 file(LOCK): Close file descriptor/handle when releasing a lock
| * | | file(LOCK): Close file descriptor/handle when releasing a lockBetsy McPhail2015-03-252-0/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file lock functionality added in commit v3.2.0-rc1~297^2~1 (file: Add LOCK subcommand to do file and directory locking, 2014-11-26) forgot to close the lock file descriptors. Eventually it was possible to run out of file descriptors and locks could not longer be acquired. Fix this by closing the file descriptor or handle when we are done with it. Also set the member back to the initial value from the constructor to leave everything in a consistent state (useful for debugging). Co-Author: Ruslan Baratov <ruslan_baratov@yahoo.com>
* | | CMake Nightly Date StampKitware Robot2015-03-251-1/+1
| |/ |/|
* | Merge topic 'SunPro-no-KPIE'Brad King2015-03-242-2/+0
|\ \ | | | | | | | | | | | | 209c142f SunPro: Drop non-existent -KPIE flag
| * | SunPro: Drop non-existent -KPIE flagSteven Vancoillie2015-03-232-2/+0
| | |
* | | Merge topic 'blugeneq-platform-files'Brad King2015-03-2415-0/+403
|\ \ \ | | | | | | | | | | | | | | | | 13807bcb BlueGene/Q Platform files
| * | | BlueGene/Q Platform filesTodd Gamblin2015-03-1915-0/+403
| | | | | | | | | | | | | | | | | | | | - based on the BlueGene/P platform files. - tested by Todd Gamblin (LLNL) and David DeMarle (Kitware)
* | | | Merge topic 'install-sphinx-object-mapping'Brad King2015-03-241-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 840f5b89 Help: Install Sphinx HTML object mapping file
| * | | | Help: Install Sphinx HTML object mapping fileGregor Jasny2015-03-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To link CMake documentation from other documentation sets like KDE extra-cmake-modules the intersphinx extension depends on the objects.inv mapping file. The size overhead of 14k seems to be neglectable. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | Merge topic 'xcode5-xctest'Brad King2015-03-242-7/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ab14134 Tests: Enable XCTest tests for Xcode 5 52642b46 OS X: Look for Xcode 5 platform-specific Frameworks
| * | | | | Tests: Enable XCTest tests for Xcode 5Gregor Jasny2015-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
| * | | | | OS X: Look for Xcode 5 platform-specific FrameworksGregor Jasny2015-03-241-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Xcode 5 platform specific framework locations differ from the Xcode 6 ones. Look first for the Xcode 6 ones, then for iOS Xcode 5 ones and last for the Xcode 5 OS X ones. For reference, the XCTest.framework is located as follows: Xcode511.app/Contents/Developer/Library/Frameworks/XCTest.framework Xcode511.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/Developer/Library/Frameworks/XCTest.framework Xcode511.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator7.1.sdk/Developer/Library/Frameworks/XCTest.framework Xcode601.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework Xcode601.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework Xcode601.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks/XCTest.framework Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | CMake Nightly Date StampKitware Robot2015-03-241-1/+1
|/ / / / /