summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'backport-NIOS2-CPU'Brad King2015-12-020-0/+0
|\ | | | | | | | | f2ca704c Add NIOS2 CPU support
| * Add NIOS2 CPU supportMarek Vasut2015-12-022-0/+8
| | | | | | | | | | | | | | | | | | Add necessary bits to support the NIOS2 little-endian CPU. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Ley Foon Tan <lftan@altera.com> Cc: Thomas Chou <thomas@wytron.com.tw> Cc: Walter Goossens <waltergoossens@home.nl>
* | Merge topic 'cpack-dmg-multilanguage-sla'Brad King2015-12-023-8/+36
|\ \ | | | | | | | | | | | | ae434ee2 CPack/DragNDrop: Allow single license for multiple languages
| * | CPack/DragNDrop: Allow single license for multiple languagesSimon Levermann2015-12-023-8/+36
| | | | | | | | | | | | | | | | | | | | | When both CPACK_DMG_SLA_DIR and CPACK_RESOURCE_FILE_LICENSE are defined, use the license file for all languages instead of looking for a license file for each language. Also expand the documentation on the SLA variables.
* | | Merge topic 'include-for-mode_t'Brad King2015-12-021-0/+2
|\ \ \ | | | | | | | | | | | | | | | | 001043ac Include `sys/types.h` header to get `mode_t`
| * | | Include `sys/types.h` header to get `mode_t`Kylie McClain2015-12-021-0/+2
| | |/ | |/| | | | | | | | | | Do not depend on it being included by other system headers. It is not included by others on musl-libc, for example.
* | | Merge topic 'reduce-realpath-calls'Brad King2015-12-022-4/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | 4e3cf8b0 cmOrderDirectories: Reduce repeat realpath() calls 6b185287 cmOrderDirectories: Factor out directory comparison
| * | | cmOrderDirectories: Reduce repeat realpath() callsBrad King2015-12-012-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~110^2 (Tolerate symlinks during RPATH ordering, 2014-09-09) we call realpath() for every directory ordering constraint check. On some platforms/filesystems this is slow, so memoize the result of the call for each directory.
| * | | cmOrderDirectories: Factor out directory comparisonBrad King2015-12-012-4/+12
| |/ / | | | | | | | | | Create an `IsSameDirectory` helper method.
* | | Merge topic 'update-kwsys'Brad King2015-12-023-31/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | fe05ad97 Merge branch 'upstream-kwsys' into update-kwsys e25f294a KWSys 2015-12-01 (9596e98d)
| * \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-12-013-31/+28
| |\ \ \
| | * | | KWSys 2015-12-01 (9596e98d)KWSys Robot2015-12-013-31/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 9596e98d | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' a7e5360f..9596e98d Dmitry Marakasov (1): b86a2a3e Process: Fix off-by-one when adding two times Marek Vasut (1): ddfa8019 CPU: Add NIOS2 support Rolf Eike Beer (2): 0adafb51 SystemTools: use FindProgram() overload that checks for directory 9596e98d SystemTools: move some code around that is used only on Windows-like platforms
* | | | | Merge topic 'update-kwiml'Brad King2015-12-021-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58c1840a Merge branch 'upstream-kwiml' into update-kwiml eec87ec8 KWIML: Teach ABI.h that NIOS2 CPU is little-endian
| * \ \ \ \ Merge branch 'upstream-kwiml' into update-kwimlBrad King2015-11-301-0/+4
| |\ \ \ \ \
| | * | | | | KWIML: Teach ABI.h that NIOS2 CPU is little-endianMarek Vasut2015-11-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marek Vasut <marex@denx.de> Cc: Ley Foon Tan <lftan@altera.com> Cc: Thomas Chou <thomas@wytron.com.tw> Cc: Walter Goossens <waltergoossens@home.nl>
* | | | | | | CMake Nightly Date StampKitware Robot2015-12-021-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-12-011-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'release'Brad King2015-11-300-0/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'reduce-cmState-accumulation' into releaseBrad King2015-11-308-66/+121
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-find_package-version-file-error-stack' into releaseBrad King2015-11-2519-2/+40
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'test-add_subdirectory-in-function' into releaseBrad King2015-11-244-0/+33
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'revert-compiler-links-statically' into releaseBrad King2015-11-237-23/+0
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'reduce-cmState-accumulation-for-master'Brad King2015-11-308-66/+121
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9342a4c2 Merge branch 'reduce-cmState-accumulation' into reduce-cmState-accumulation-for-master 5f860ebb cmState: Avoid accumulating snapshot storage for short-lived scopes f21dc4a8 cmState: Avoid accumulating policy stack storage for short-lived scopes bc1d3a8a cmListFileCache: Implement cmListFileBacktrace ctor/dtor out-of-line 85fe26b5 cmLinkedTree: Add Pop method 518d6b22 cmLinkedTree: Rename 'Extend' method to 'Push' 32edac6f cmState: Enforce policy scope balancing around variable scopes 0fa7f143 cmLocalGenerator: Use ScopePushPop RAII class to manage local variable scopes d85c9176 cmMakefile: Remove unused PolicyPushPop interfaces 8e1be7bf cmMakefile: Clarify purpose of method that pops a scope snapshot
| * \ \ \ \ \ \ \ \ \ Merge branch 'reduce-cmState-accumulation' into ↵Brad King2015-11-258-66/+121
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | / / / / | | |_|_|_|_|/ / / / | |/| | | | | | | | reduce-cmState-accumulation-for-master
| | * | | | | | | | cmState: Avoid accumulating snapshot storage for short-lived scopesBrad King2015-11-253-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to keep only certain snapshot types and their ancestors. Also keep those needed for backtraces.
| | * | | | | | | | cmState: Avoid accumulating policy stack storage for short-lived scopesBrad King2015-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We enforce policy push/pop balance around any scope that pushes/pops a snapshot. Therefore a snapshot may never reference entries of PolicyStack that were created in nested scopes. Free storage of short-lived policy stack entries when they are popped.
| | * | | | | | | | cmListFileCache: Implement cmListFileBacktrace ctor/dtor out-of-lineBrad King2015-11-252-4/+13
| | | | | | | | | |
| | * | | | | | | | cmLinkedTree: Add Pop methodBrad King2015-11-251-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a method to increment an iterator (follow the "up" pointer) to the previous level in the stack of scopes and free storage of the top of the stack if possible. This will allow short-lived scopes to be created and destroyed by matching Push/Pop pairs without accumulating storage.
| | * | | | | | | | cmLinkedTree: Rename 'Extend' method to 'Push'Brad King2015-11-252-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logically the method pushes a nested scope on top of a given scope because the "up" pointer sequence forms a stack independent of any other branches of the tree.
| | * | | | | | | | cmState: Enforce policy scope balancing around variable scopesBrad King2015-11-252-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Everywhere we use cmMakefile::ScopePushPop to manage variable scopes also expects policy scopes to be balanced. There is no place that we use cmMakefile::PolicyPushPop without also using ScopePushPop. Relieve PolicyPushPop of responsibility for policy scope balance checks by moving it to ScopePushPop.
| | * | | | | | | | cmLocalGenerator: Use ScopePushPop RAII class to manage local variable scopesBrad King2015-11-251-4/+2
| | | | | | | | | |
| | * | | | | | | | cmMakefile: Remove unused PolicyPushPop interfacesBrad King2015-11-252-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PolicyPushPop constructor arguments and Quiet method were used to pass non-default arguments to PushPolicy and PopSnapshot, but no clients use them anymore.
| | * | | | | | | | cmMakefile: Clarify purpose of method that pops a scope snapshotBrad King2015-11-252-8/+11
| | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `PopPolicyBarrier` method is actually responsible for closing any scope opened by creating a snapshot. Rename it to `PopSnapshot` and add a comment explaining the purpose of the poilcy-scope-specific part of the method.
* | | | | | | | | CMake Nightly Date StampKitware Robot2015-11-301-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2015-11-291-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2015-11-281-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2015-11-271-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2015-11-261-1/+1
|/ / / / / / / /
* | | | | | | | Merge topic 'fix-find_package-version-file-error-stack'Brad King2015-11-2512-2/+26
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62126b67 Merge branch 'test-cmake_policy-unmatched' into fix-find_package-version-file-error-stack 2e28c619 cmState: Skip variable scope snapshots to avoid call stack duplicates b219ff94 Tests: Add case for package version file unmatched policy scope
| * | | | | | | Merge branch 'test-cmake_policy-unmatched' into ↵Brad King2015-11-2418-0/+36
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-find_package-version-file-error-stack
| | * | | | | | | Tests: Add case for package version file unmatched policy scopeBrad King2015-11-2411-0/+22
| | | | | | | | |
| * | | | | | | | cmState: Skip variable scope snapshots to avoid call stack duplicatesBrad King2015-11-241-2/+4
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.4.0-rc1~179^2~1 (cmState: Add a VariableScope snapshot type, 2015-08-23) the snapshot stack may have a VariableScopeType entry. Skip over these when constructing the call stack, just as we do for policy scopes. Otherwise we report the command causing the variable scope to be entered twice (e.g. find_package while loading a package version file).
* | | | | | | | Merge topic 'test-cmake_policy-unmatched'Brad King2015-11-257-0/+14
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | 378185fb Tests: Add case for unmatched cmake_policy({PUSH,POP})
| * | | | | | | Tests: Add case for unmatched cmake_policy({PUSH,POP})Brad King2015-11-247-0/+14
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2015-11-251-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'FindCUDA-aarch64'Brad King2015-11-241-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae1003cd FindCUDA: Add paths for crosscompiling to aarch64
| * | | | | | | | FindCUDA: Add paths for crosscompiling to aarch64Alexander Szakaly2015-11-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Choose a CUDA_TOOLKIT_TARGET_DIR for the aarch64 architecture automatically.
* | | | | | | | | Merge topic 'FindXercesC-imported-targets'Brad King2015-11-246-10/+99
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5dcc833b FindXercesC: Add imported targets and unit test
| * | | | | | | | | FindXercesC: Add imported targets and unit testRoger Leigh2015-11-236-10/+99
| | | | | | | | | |
* | | | | | | | | | Merge topic 'doc-CLEAN_NO_CUSTOM-makefile-only'Brad King2015-11-241-4/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15c454fe Help: Document CLEAN_NO_CUSTOM as for Makefile generators only (#15856)