summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'update-kwsys'Brad King2014-09-103-6/+72
|\ | | | | | | | | | | daab3b3b Merge branch 'upstream-kwsys' into update-kwsys 92b582a6 KWSys 2014-09-08 (fb77be5a)
| * Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-09-093-6/+72
| |\
| | * KWSys 2014-09-08 (fb77be5a)KWSys Robot2014-09-093-6/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ fb77be5a | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 32023afd..fb77be5a Brad King (1): 80e852f6 kwsysPlatformTests: Use if(DEFINED) to simplify conditions Clinton Stimpson (2): 93eb1a1f SystemTools: Improve RelativePath() to handle ./ ../ and // fb77be5a SystemTools: Fix GetCasePathName to handle wildcards on Windows. Change-Id: Ieff09366e214055be0b62eae42fc64f3bb3b6e76
* | | Merge topic 'FindIce-updates'Brad King2014-09-101-18/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | 2131aedd FindIce: Respect Ice_FIND_QUIETLY when printing messages d5047ca1 FindIce: Remove unneeded search path modification
| * | | FindIce: Respect Ice_FIND_QUIETLY when printing messagesRoger Leigh2014-09-091-12/+16
| | | |
| * | | FindIce: Remove unneeded search path modificationRoger Leigh2014-09-091-7/+0
| | | | | | | | | | | | | | | | Drop code adding redundant "/opt/Ice-${ice_version}" paths.
* | | | Merge topic 'string-uuid-doc-fix'Brad King2014-09-101-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e6ba52e8 StringUuid: Mark UPPER flag optional in sub-command synopsis
| * | | | StringUuid: Mark UPPER flag optional in sub-command synopsisNils Gladitz2014-09-101-1/+1
| | | | |
* | | | | Merge topic 'tolerate-lib-dir-symlink'Brad King2014-09-101-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f99cc9c3 Tolerate symlinks during RPATH ordering (#13429)
| * | | | | Tolerate symlinks during RPATH ordering (#13429)Brad King2014-09-091-2/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Arch Linux, /lib and /lib64 are symlinks to /usr/lib. When ordering runtime library search paths, we must not consider these to be distinct directories. Before considering conflicts between two directories, check that they do not have the same 'realpath'. Inspired-by: Myles English <mylesenglish@gmail.com>
* | | | | CMake Nightly Date StampKitware Robot2014-09-101-1/+1
| | | | |
* | | | | Merge branch 'release'Brad King2014-09-090-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'ExternalProject-download-loop' into releaseBrad King2014-09-081-0/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'use-consistent-regex-for-info-strings'Brad King2014-09-094-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e84e78c Use a more reliable regex for extracting binary INFO strings
| * | | | | | | Use a more reliable regex for extracting binary INFO stringsChuck Atkins2014-09-034-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few different regular expressions were being used in various places to extract info strings from binaries. This uses a consistent regex amongst all of them now. This also fixes the broken ABI detection for Cray compilers.
* | | | | | | | Merge topic 'doc-add_custom_command-multiple-commands'Brad King2014-09-091-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1fdf4ff0 Help: Suggest in add_custom_command how to create a script (#15112)
| * | | | | | | | Help: Suggest in add_custom_command how to create a script (#15112)Brad King2014-09-081-0/+3
| | | | | | | | |
* | | | | | | | | Merge topic 'ExternalProject-download-loop'Brad King2014-09-091-0/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | / / / / | |_|_|_|/ / / / |/| | | | | | | 9f49ac3d ExternalProject: Avoid infinite loop on file download hash mismatch
| * | | | | | | ExternalProject: Avoid infinite loop on file download hash mismatchAlan W. Irwin2014-09-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the loop was added by commit v3.0.0-rc1~103^2~3 (ExternalProject: Reattempt download when verification fails, 2015-01-15), we forgot to actually increment the loop counter. Add the increment line.
* | | | | | | | CMake Nightly Date StampKitware Robot2014-09-091-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release'Brad King2014-09-080-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'fix-clang-cross-compile-find-binutils' into releaseBrad King2014-09-052-2/+6
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'fix-clang-cross-compile-find-binutils'Brad King2014-09-082-2/+6
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | 72d66818 Fix finding binutils when cross-compiling with Clang
| * | | | | | | Fix finding binutils when cross-compiling with ClangBrad King2014-09-052-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.0.0-rc1~342^2~2 (Add compiler target compile options, 2013-05-19) we use CMAKE_<LANG>_COMPILER_TARGET as the binutils prefix when cross-compiling with Clang. Fix the implementation to use the compiler target as the prefix only when it is set. Otherwise toolchain files not using CMAKE_<LANG>_COMPILER_TARGET cause the logic to use a prefix of just "-" and of course cannot find "-ar" or "-ld".
* | | | | | | | CMake Nightly Date StampKitware Robot2014-09-081-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-09-071-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-09-061-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-09-051-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'fix-gtk2-missing-optional-includes'Brad King2014-09-041-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb8f0f7c FindGTK2: Fix missing optional include dirs.
| * | | | | | | | FindGTK2: Fix missing optional include dirs.Chuck Atkins2014-09-041-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindGTK2 was adding optional include directories to the interface include dirs regardless of whether or not they existed. This ensures that the directories only get added if they are actually found. This is particularly a problem on Solaris where the gtk2 libs and headers might exist but the FreeType2 headers might not.
* | | | | | | | | Merge branch 'release'Brad King2014-09-040-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'backport-xcode-duplicate-file-refs' into releaseBrad King2014-09-031-6/+4
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'doc-add_custom_command-multiple-commands'Brad King2014-09-041-1/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 412926d0 Help: Clarify add_custom_command multiple command behavior (#15112)
| * | | | | | | | | Help: Clarify add_custom_command multiple command behavior (#15112)Brad King2014-09-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly say that the commands are not composed into a stateful script.
* | | | | | | | | | Merge topic 'doc-try_compile-debug-advice'Brad King2014-09-041-3/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abbe91c5 Help: Clarify --debug-trycompile usage with try_compile
| * | | | | | | | | | Help: Clarify --debug-trycompile usage with try_compileAlan W. Irwin2014-09-031-3/+4
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain that try_compile calls need to be protected with conditions to avoid running more than once so that it is easy to isolate a single try_compile to perform with --debug-trycompile.
* | | | | | | | | | Merge topic 'xcode-duplicate-file-refs'Brad King2014-09-041-6/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d73f8828 Merge branch 'backport-xcode-duplicate-file-refs' into xcode-duplicate-file-refs cf92fe2d Xcode: Generate per-target file references (#15111) e7114226 Xcode: Generate per-target file references (#15111)
| * \ \ \ \ \ \ \ \ \ Merge branch 'backport-xcode-duplicate-file-refs' into xcode-duplicate-file-refsBrad King2014-09-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflicts in Source/cmGlobalXCodeGenerator.cxx in favor of our side.
| | * | | | | | | | | Xcode: Generate per-target file references (#15111)Brad King2014-09-031-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode requires a separate PBXFileReference for each target source group that references a source file. Xcode 6 now diagnoses re-use of the same PBXFileReference from multiple source groups. Add the referencing target name to our internal map key so we use a per-target reference.
| * | | | | | | | | | Xcode: Generate per-target file references (#15111)Brad King2014-09-031-6/+4
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode requires a separate PBXFileReference for each target source group that references a source file. Xcode 6 now diagnoses re-use of the same PBXFileReference from multiple source groups. Add the referencing target name to our internal map key so we use a per-target reference.
* | | | | | | | | | Merge topic 'xcode-assetcatalog-folder-type'Brad King2014-09-041-8/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8eacc339 Xcode: Reference '.xcassets' folders as assetcatalog (#15125) 02aa5965 Xcode: Refactor internal file type extension extraction
| * | | | | | | | | | Xcode: Reference '.xcassets' folders as assetcatalog (#15125)Brad King2014-09-031-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Xcode: Refactor internal file type extension extractionBrad King2014-09-031-7/+7
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move it earlier so it can be used for directories too.
* | | | | | | | | | Merge topic 'bash-complete-ctest-labels'Brad King2014-09-041-2/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2603e128 bash-completion: Complete 'ctest' label names
| * | | | | | | | | | bash-completion: Complete 'ctest' label namesSylvain Joubert2014-09-031-2/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge topic 'InstallRequiredSystemLibraries-vs-openmp'Brad King2014-09-042-0/+42
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d538c55e Help: Add notes for topic 'InstallRequiredSystemLibraries-vs-openmp' bdb5007b InstallRequiredSystemLibraries: Install OpenMP runtime libs (#15117)
| * | | | | | | | | | Help: Add notes for topic 'InstallRequiredSystemLibraries-vs-openmp'Brad King2014-09-041-0/+6
| | | | | | | | | | |
| * | | | | | | | | | InstallRequiredSystemLibraries: Install OpenMP runtime libs (#15117)Gregory Sharp2014-09-021-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option CMAKE_INSTALL_OPENMP_LIBRARIES to control the behavior.
* | | | | | | | | | | Merge topic 'vim-syntax'Brad King2014-09-041-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce540aea cmake-syntax.vim: Update the command list
| * | | | | | | | | | | cmake-syntax.vim: Update the command listLukáš Lalinský2014-09-041-2/+2
| | |/ / / / / / / / / | |/| | | | | | | | |
generated by cgit v0.12 at 2025-01-28 23:10:32 (GMT)