summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ / / / /
* | | | | Merge topic 'ninja-require-byproducts'Brad King2015-03-2325-22/+290
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd9c7f9b Ninja: Add policy to require explicit custom command byproducts ed8e30b0 cmGlobalNinjaGenerator: Optimize handling of known build outputs ad094f43 cmGlobalNinjaGenerator: Fix spelling of "unknown" 82a37d3c cmGlobalNinjaGenerator: Drop unused member
| * | | | | Ninja: Add policy to require explicit custom command byproductsBrad King2015-03-2025-6/+279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add policy CMP0058 to avoid generating 'phony' ninja rules for unknown custom command dependencies. This requires projects to specify their custom command byproducts explicitly. With this requirement we no longer have to assume that unknown custom command dependencies are generated and can instead simply assume they are source files expected to exist when the build starts. This is particularly important in in-source builds. It is also helpful for out-of-source builds to allow Ninja to diagnose missing files before running custom command rules that depend on them.
| * | | | | cmGlobalNinjaGenerator: Optimize handling of known build outputsBrad King2015-03-201-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach WriteUnknownExplicitDependencies to take ownership of the set of WriteBuild outputs immediately since no other methods need the data. This avoids re-inserting the whole set into another already populated set.
| * | | | | cmGlobalNinjaGenerator: Fix spelling of "unknown"Brad King2015-03-201-4/+4
| | | | | |
| * | | | | cmGlobalNinjaGenerator: Drop unused memberBrad King2015-03-181-2/+0
| | | | | |
* | | | | | Merge topic 'lib64_paths_crosscompiling'Brad King2015-03-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81bfebfe Linux: Ignore Debian-specific case when cross-compiling
| * | | | | | Linux: Ignore Debian-specific case when cross-compilingZack Galbreath2015-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When constructing settings for the target environment during cross compiling we should not check for /etc/debian_version on the host.
* | | | | | | Merge topic 'add-extra-qbs-generator'Brad King2015-03-238-1/+361
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f85db2f3 Qbs: Add new 'extra' generator for qbs project files
| * | | | | | | Qbs: Add new 'extra' generator for qbs project filesStanislav Ionascu2015-03-208-1/+361
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'UseJava-fix-arg-parse'Brad King2015-03-231-11/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a21e8df0 UseJava: Fix add_jar argument parsing (#14655)
| * | | | | | | UseJava: Fix add_jar argument parsing (#14655)Mark Studenka2015-03-201-11/+11
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.11~63^2 (UseJava.cmake: require explicit request to include jars, 2013-03-26) the argument parsing always overrides the variable settings even if the corresponding arguments are not passed. Re-order logic to fix this.
* | | | | | | Merge topic 'cpack-bundle-codesign'Brad King2015-03-232-3/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb3e4de8 CPack: Add support to overwrite or pass additional parameter to codesign
| * | | | | | | CPack: Add support to overwrite or pass additional parameter to codesignAndré Klitzing2015-03-232-3/+16
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'autogen-write-access'Brad King2015-03-231-0/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 610464c1 QtAutogen: Ensure write access to AutogenInfo.cmake (#15416)
| * | | | | | | QtAutogen: Ensure write access to AutogenInfo.cmake (#15416)Justin Borodinsky2015-03-201-0/+14
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConfigureFile uses the input file permissions, but we require write access in cmQtAutoGenerators::SetupAutoGenerateTarget to append to the file.
* | | | | | | Merge topic 'cpack-rpm-ignore-default-prefix'Brad King2015-03-233-4/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18917d66 CPack/RPM ignore install prefix relocation path
| * | | | | | | CPack/RPM ignore install prefix relocation pathDomen Vrankar2015-03-203-4/+25
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch adds possibility to remove CPACK_PACKAGING_INSTALL_PREFIX from the list of relocation paths when crating a relocatable rpm.
* | | | | | | Merge topic 'SunPro-Fortran-KPIC'Brad King2015-03-231-0/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | 3556fb1b SunPro: Add position independent code flag for Fortran compiler
| * | | | | | SunPro: Add position independent code flag for Fortran compilerSteven Vancoillie2015-03-201-0/+1
| |/ / / / /
* | | | | | Merge topic 'pgi-no-pie'Brad King2015-03-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00842df4 PGI: Remove invalid -fPIE flag (#15460)
| * | | | | | PGI: Remove invalid -fPIE flag (#15460)Brad King2015-03-201-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PGI compilers on Linux do not have the -fPIE flag. Remove the table entry added by commit v2.8.9~125^2~2 (Add platform variables for position independent code flags, 2012-05-05), which likely included it only as part of a sweeping introduction of such flags.
* | | | | | Merge topic 'xcode-xctest'Brad King2015-03-2322-3/+1148
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4178cd88 Help: Add notes for topic 'xcode-xctest' 87a4b858 Tests: Add XCTest example to test Frameworks and Cocoa App Bundles ba14510b OS X: Add FindXCTest module 3714955b OS X: Add handling for XCTest bundles 54a5cdbb Tests: Compute Xcode version for any generator on OS X
| * | | | | | Help: Add notes for topic 'xcode-xctest'Brad King2015-03-231-0/+6
| | | | | | |
| * | | | | | Tests: Add XCTest example to test Frameworks and Cocoa App BundlesGregor Jasny2015-03-2313-0/+890
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
| * | | | | | OS X: Add FindXCTest moduleGregor Jasny2015-03-233-0/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a module to lookup XCTest Framework and xctest utility. It also provides APIs for creating 'xctest' targets. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
generated by cgit v0.12 at 2024-12-27 11:13:19 (GMT)