summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'vs14-is-2015' into releaseBrad King2014-11-172-11/+31
|\
| * VS: Rename VS 14 generator to 'Visual Studio 14 2015'Brad King2014-11-142-11/+31
| | | | | | | | | | | | Now that we know the year component of this VS version we can add it to the generator name. For convenience, map the name without the year to the name with the year.
* | Merge branch 'kwsys-SharedForward-vs14' into releaseBrad King2014-11-171-1/+1
|\ \
| * | KWSys SharedForward: Hard-code the ldpath buffer size to below VS 14 limitBrad King2014-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | Visual Studio 14 (2015) complains if a static character array is declared with more than 65535 elements. This limit should be large enough for SharedForward clients, so just hard-code that instead of trying to compute a limit.
* | | Merge branch 'vs-nsight-tegra-version' into releaseBrad King2014-11-131-2/+2
|\ \ \
| * | | VS: Change Nsight Tegra 2.0 Project Revision Number from 8 to 9Dmitry Polyanitsa2014-11-131-2/+2
| | | | | | | | | | | | | | | | | | | | A hotfix to Nsight Tegra 2.0 needed to increase the project number. Teach CMake to generate the newer number for this version.
* | | | Merge branch 'no-cmake-self-install-when-cross-compiling' into releaseBrad King2014-11-131-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Do not use just-built CMake to install itself when cross-compiling (#15248)Brad King2014-11-131-1/+2
| |/ / | | | | | | | | | | | | | | | The special case added by commit v2.4.0~3051 (When building CMake itself, use the new cmake to install so that the current cmake can be overwritten, 2004-06-09) does not make sense when cross-compiling.
* | | CMake 3.1.0-rc2v3.1.0-rc2Brad King2014-11-121-1/+1
| | |
* | | Merge branch 'kwsys-SystemInformation-AIX-_SC_AIX_REALMEM' into releaseBrad King2014-11-121-1/+1
|\ \ \ | | |/ | |/|
| * | KWSys SystemInformation: Check for _SC_AIX_REALMEM before using itÅdne Hovda2014-11-111-1/+1
| | | | | | | | | | | | | | | Add a check for supported flag when querying for system memory on AIX 5.1.
* | | Merge branch 'fix_link-line-dedup_regression' into releaseBrad King2014-11-111-4/+9
|\ \ \
| * | | Fix link line order when shared libraries are de-duplicatedDaniele E. Domenichelli2014-11-101-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~227^2~1 (De-duplicate shared library targets in generated link lines, 2014-07-30) we de-duplicate shared library targets on the link line. However, some toolchains will fail linking if an executable is linking to a shared library that is not used directly and a static library that depends on the shared one. The linker may not keep the reference to the shared library the first time and then the symbols needed by the static library may not be found. Fix this by reversing the direction of the for loop that removes the duplicate shared libraries, in order to ensure that the last occurrence of the library is left instead of the first one. Extend Tests/Dependency with a case covering this behavior. Create an executable that links to a shared library and a static library but only needs the shared library as a dependency of the static library. Co-Author: Brad King <brad.king@kitware.com>
* | | | genex: Preserve order while evaluating TARGET_OBJECTSClinton Stimpson2014-11-071-4/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic introduced in commit v3.1.0-rc1~688^2~9 (Genex: Evaluate TARGET_OBJECTS as a normal expression, 2014-02-26) ordered a map by pointer value and then constructed a list of object files by iterating over the map. This is not deterministic. Since commit v3.1.0-rc1~688^2~5 (cmTarget: Allow any generator expression in SOURCES property, 2014-03-18) the order produced by the above-mentioned logic started being used for the actual list of object files on the link line. Since it is not deterministic, spurious re-links occur after re-running CMake simply because the order of objects changed on the link line. Fix this by iterating over the original vector of source files instead of the map. This has a deterministic order.
* | | Merge branch 'fix-configure_file-COPYONLY' into releaseBrad King2014-11-031-1/+1
|\ \ \ | |/ / |/| |
| * | KWSys: Fix configure_file call to use COPYONLY, not COPY_ONLYBrad King2014-10-311-1/+1
| |/
* | Merge branch 'revert-definition-map-lookup' into releasev3.1.0-rc1Brad King2014-10-243-24/+10
|\ \
| * | Revert "cmDefinitions: Don't store parent lookups"Ben Boeckel2014-10-243-24/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5abfde6cb8a1ae0b2825797eab6c2e9842eb7c49. The behaviors associated with implicit pulldown on variable lookup seriously conflict with the optimizations made in these commits. Basically, since values were copied upon variable lookup, not just on PARENT_SCOPE, coupled with PARENT_SCOPE's behavior based on whether the variable is in the current scope or not causes serious problems with not storing a value for every variable at every scope. The commit changed behavior of the following example, among other cases: function(test_set) set(blah "value2") message("before PARENT_SCOPE blah=${blah}") set(blah ${blah} PARENT_SCOPE) message("after PARENT_SCOPE blah=${blah}") endfunction() set(blah value1) test_set() message("in parent scope, blah=${blah}") Reported-by: Alex Merry <alex.merry@kde.org> Reported-by: Ben Cooksley <bcooksley@kde.org>
* | | 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
| |_|/ / / / |/| | | | |