summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ / / / /
* | | | | 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
generated by cgit v0.12 at 2025-01-29 20:22:30 (GMT)