summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Begin post-3.1 developmentBrad King2014-10-141-2/+2
|
* CMake 3.1.0-rc1 version updateBrad King2014-10-141-3/+3
|
* Merge topic 'fix-comment-typos'Brad King2014-10-1415-20/+20
|\ | | | | | | | | bef23e81 Fix some spelling errors in comments
| * Fix some spelling errors in commentsGeoff Viola2014-10-1315-20/+20
| |
* | CMake Nightly Date StampKitware Robot2014-10-141-1/+1
| |
* | Merge topic 'fix-ninja-rc-include-flags'Brad King2014-10-135-8/+15
|\ \ | | | | | | | | | | | | f4c5eade Ninja: Fix RC include directories regression
| * | Ninja: Fix RC include directories regressionBrad King2014-10-135-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in commit b9aa5041 (cmLocalGenerator: Simplify GetIncludeFlags output formatting, 2014-03-04) caused Windows Resource Compiler include directories to be computed as relative paths in the Ninja generator. This breaks the cmcldeps handling of include paths. The reason for the regression is that several cmLocalGenerator::GetIncludeFlags callers treated the fourth "bool forResponseFile" argument as if it controlled whether include directories were a full path. It actually did control that by accident until the above commit. Add an explicit "bool forceFullPaths" argument to GetIncludeFlags and thread the value through ConvertToIncludeReference as needed. Update GetIncludeFlags call sites that really wanted to control the forResponseFile setting to be aware of the new argument. Extend the VSResource test to cover this case.
* | | CMake Nightly Date StampKitware Robot2014-10-131-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-10-121-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-10-111-1/+1
| | |
* | | Merge topic 'fix-OSX-bundle-rpaths-and-Qt5'Brad King2014-10-102-28/+80
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 631fadea Help: Add notes for topic 'fix-OSX-bundle-rpaths-and-Qt5' 50e261dd OSX: Warn when attempting to change runtime paths on OS X 10.5 9b98fd52 cmake-gui: Make sure we bundle Qt5 Cocoa platform plugin 83a06bb4 BundleUtilities: Framework codesign Resources/Info.plist & Current f7df82ac BundleUtilities: Resolve & replace @rpath placeholders 14bc686f GetPrerequisites: Make sure dyld placeholders are prefixes 6c313797 BundleUtilities: Use find on UNIX for fast executable lookup
| * | OSX: Warn when attempting to change runtime paths on OS X 10.5Clinton Stimpson2014-10-101-27/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though 10.5 supports @rpath, the support is not complete enough for CMake. For instance, install_name_tool doesn't support adding and removing rpaths. Also modifying BundleUtilities test to remove an undesirable cmake generated runtime path. The intent was to build with the install rpath as is done with the other cases in this test.
| * | cmake-gui: Make sure we bundle Qt5 Cocoa platform pluginAdam Strzelecki2014-10-101-1/+27
| | | | | | | | | | | | Otherwise CMake.app bundle will not run when using Qt5.
* | | CMake Nightly Date StampKitware Robot2014-10-101-1/+1
| | |
* | | Merge topic 'ninja-phony-rules-only-in-build-tree'Brad King2014-10-091-6/+16
|\ \ \ | |_|/ |/| | | | | | | | de8e534b Ninja: Limit custom command side-effects to build folder
| * | Ninja: Limit custom command side-effects to build folderBrad King2014-10-081-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 7243c951 (Ninja: Don't limit custom cmd side-effects to build folder, 2014-06-27) because it causes every custom command dependency in the source tree to get a phony rule. For large projects these rules get too big for Ninja to handle efficiently. While the original change addressed a valid concern, it did not seem to occur regularly in practice because well-behaved projects generate their side-effects only in the build tree. Until we support explicit specification of side-effects (CMake issue #14963), we will have to use this as a middle-ground.
* | | CMake Nightly Date StampKitware Robot2014-10-091-1/+1
| | |
* | | Merge topic 'ctest-memcheck-sanitizers'Brad King2014-10-082-18/+65
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | e0e75a72 Help: Add notes for topic 'ctest-memcheck-sanitizers' 7345a1f7 tests: Add a test for ctest_memcheck MemorySanitizer 0c6330da ctest_memcheck: Add support for MemorySanitizer msan 9ba8bf12 tests: add a test for ctest_memcheck UndefinedBehaviorSanitizer 816c100a ctest_memcheck: Add support for UndefinedBehaviorSanitizer ubsan b67ef537 ctest_memcheck: Order sanitizer type code consistently f48a2968 Tests: Organize CTestTestMemcheck inner test code
| * | ctest_memcheck: Add support for MemorySanitizer msanBill Hoffman2014-10-072-0/+23
| | |
| * | ctest_memcheck: Add support for UndefinedBehaviorSanitizer ubsanBen Boeckel2014-10-072-2/+24
| | | | | | | | | | | | | | | UBSan instruments a build and logs messages on any undefined behavior instances.
| * | ctest_memcheck: Order sanitizer type code consistentlyBrad King2014-10-072-24/+26
| | | | | | | | | | | | Use alphabetic order everywhere we enumerate the sanitizer types.
* | | CMake Nightly Date StampKitware Robot2014-10-081-1/+1
| | |
* | | Merge topic 'ctest-memcheck-sanitizers'Brad King2014-10-073-6/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | f25e431d tests: set sanitizer options properly f0661bf3 tests: fix copy/paste from tsan -> asan comments ca9cc25c ctest: add support for additional sanitizer options 0b9ffffc ctest: update documentation for CTEST_MEMORYCHECK_TYPE
| * | ctest: add support for additional sanitizer optionsBen Boeckel2014-10-032-5/+13
| | | | | | | | | | | | | | | Sanitizers receive options through their environment variable; support user-specified options here.
| * | ctest: update documentation for CTEST_MEMORYCHECK_TYPEBen Boeckel2014-10-031-1/+1
| | | | | | | | | | | | | | | | | | The AddressSanitizer value was not documented. Also fix some typos.
* | | Merge topic 'fix-ninja-rsp-var-duplication'Brad King2014-10-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 71da30ca Ninja: Fix variable duplication in RSP rules
| * | | Ninja: Fix variable duplication in RSP rulesNils Gladitz2014-10-061-1/+1
| | | | | | | | | | | | | | | | Stream clear() resets stream state but does not actually clear its content.
* | | | Merge topic 'cpack-ifw-updates'Brad King2014-10-074-37/+155
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | ed9684a2 CPackIFW: Added support for multiple repositories f9f74874 CPackIFW: Search algorithm update
| * | | | CPackIFW: Added support for multiple repositoriesKonstantin Podsvirov2014-10-054-25/+142
| | | | | | | | | | | | | | | | | | | | Now user can add IFW specific repo with cpack_ifw_add_repository macro
| * | | | CPackIFW: Search algorithm updateKonstantin Podsvirov2014-10-041-12/+13
| | | | | | | | | | | | | | | | | | | | Variables like CPACK_IFW_*_EXECUTABLE_FOUND now not needed
* | | | | Merge topic 'encoding-fstream'Brad King2014-10-074-14/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 42e39bb3 Fix a few more places to use cmsys::[io]fstream instead of std::fstream.
| * | | | | Fix a few more places to use cmsys::[io]fstream instead of std::fstream.Clinton Stimpson2014-10-044-14/+15
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-10-071-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'fix-cobertura-parsing'Brad King2014-10-061-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1c838add cmParseCoberturaCoverage: Initialize CurFileName to empty string
| * | | | | cmParseCoberturaCoverage: Initialize CurFileName to empty stringJonathan Beezley2014-10-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the file is not found in $CMAKE_SOURCE_DIR/<file path>, the CurFileName pointer remained set to the previous file. This caused the new file's coverage data to populate the into the wrong object giving incorrect results and occasionally resulting in a seg fault.
* | | | | | Merge topic 'wix-fix-root-dir-prop'Brad King2014-10-061-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb009f00 CPackWiX: Work around RelativePath() returning an empty string for the root
| * | | | | | CPackWiX: Work around RelativePath() returning an empty string for the rootNils Gladitz2014-10-031-0/+5
| |/ / / / /
* | | | | | Merge topic 'ninja-console-pool'Brad King2014-10-064-2/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f32a241 Ninja: Use 'console' pool for CMake re-run if possible (#14915)
| * | | | | | Ninja: Use 'console' pool for CMake re-run if possible (#14915)Sylvain Joubert2014-10-034-2/+50
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pre-defined 'console' pool is a non-buffered pool that runs with a depth of 1. CMake re-run cannot be run concurrently and it will eventually output something. A non-buffered pool allows to get it as soon as possible Also, generate the minimal required version of Ninja in the build file.
* | | | | | CMake Nightly Date StampKitware Robot2014-10-061-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-10-051-1/+1
| |_|_|/ / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2014-10-041-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'vs-intel-15'Brad King2014-10-031-0/+14
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | a128129a VS: Support Intel Fortran 15 .vfproj generation (#15175)
| * | | VS: Support Intel Fortran 15 .vfproj generation (#15175)Brad King2014-09-301-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version of the Intel Fortran plugin to Visual Studio says: please make sure that $(OutDir), $(TargetName) and $(TargetExt) property values match the value specified in %(Link.OutputFile) We must set TargetName and TargetExt in addition to the existing setting for OutputDirectory. The settings do not appear to hurt older versions of Intel Fortran, so set them unconditionally. Extend the FortranOnly test to cover a corresponding use case by using the OUTPUT_NAME target property. Inspired-by: Ian Harvey <Ian.Harvey@megms.com.au>
* | | | CMake Nightly Date StampKitware Robot2014-10-031-1/+1
| |/ / |/| |
* | | CMake Nightly Date StampKitware Robot2014-10-021-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-10-011-1/+1
| |/ |/|
* | Merge topic 'vs-nsight-tegra-generator'Brad King2014-09-306-5/+232
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df84281d Help: Add notes for topic 'vs-nsight-tegra-generator' 69e198dc VS: Generate Nsight Tegra project revision number 5365c9ac VS: Map Nsight Tegra file types in .vcxproj files 178f56a5 VS: Fix Tegra-Android platform linking of libraries by name 7115702f Tests: Add test for VS Nsight Tegra generator support a6289499 VS: Generate ANDROID_GUI executables as app packages c12e4699 Add 'ANDROID_API' target property to set Android Target API 9a4df52a Add 'ANDROID_GUI' target property to mark Android applications 16569abf cmTarget: Track internally whether platform is Android ef0fd4f0 VS: Teach vcxproj generation about the Tegra-Android platform d09b60f5 VS: Detect compiler id of Nsight Tegra-Android toolchains 2f071466 VS: Teach VS >= 10 to recognize CMAKE_SYSTEM_NAME 'Android'
| * | VS: Generate Nsight Tegra project revision numberBrad King2014-09-304-3/+34
| | | | | | | | | | | | | | | | | | Nsight Tegra 2.0 will be revision '8'. Generate this revision number and add a NsightTegraUpgradeOnceWithoutPrompt element to tell newer versions not to prompt when upgrading the generated project file.
| * | VS: Map Nsight Tegra file types in .vcxproj filesBrad King2014-09-301-1/+23
| | | | | | | | | | | | | | | | | | | | | Map ".java" to JCompile, ".asm" and ".s" to ClCompile, and a few Android-specific source file names to AndroidBuild. This allows Nsight Tegra 1.6 and above to check up-to-dateness of such sources. Bump NsightTegraProjectRevisionNumber to 7 to allow these fields.