kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
25,329 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

25329 Commits

Author SHA1 Message Date
Brad King cd0ead3c94 Merge topic 'tolerate-lib-dir-symlink' 
f99cc9c3 Tolerate symlinks during RPATH ordering (#13429)
 2014-09-10 11:23:12 -04:00
Kitware Robot e03b474fa8 CMake Nightly Date Stamp 2014-09-10 00:01:10 -04:00
Brad King 21ece15342 Merge branch 'release' 2014-09-09 11:24:26 -04:00
Brad King 7b2e3cc63b Merge topic 'use-consistent-regex-for-info-strings' 
3e84e78c Use a more reliable regex for extracting binary INFO strings
 2014-09-09 11:23:34 -04:00
Brad King a5c6ae69f3 Merge topic 'doc-add_custom_command-multiple-commands' 
1fdf4ff0 Help: Suggest in add_custom_command how to create a script (#15112)
 2014-09-09 11:23:32 -04:00
Brad King 371f06d005 Merge topic 'ExternalProject-download-loop' 
9f49ac3d ExternalProject: Avoid infinite loop on file download hash mismatch
 2014-09-09 11:23:30 -04:00
Brad King f99cc9c389 Tolerate symlinks during RPATH ordering (#13429) 
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>
 2014-09-09 09:01:59 -04:00
Kitware Robot a06e49cf10 CMake Nightly Date Stamp 2014-09-09 00:01:10 -04:00
Brad King 0161761d68 Merge branch 'ExternalProject-download-loop' into release 2014-09-08 16:38:49 -04:00
Alan W. Irwin 9f49ac3df0 ExternalProject: Avoid infinite loop on file download hash mismatch 
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.
 2014-09-08 16:36:35 -04:00
Brad King 1fdf4ff06a Help: Suggest in add_custom_command how to create a script (#15112) 2014-09-08 14:17:36 -04:00
Brad King 2588dcab67 Merge branch 'release' 2014-09-08 13:29:48 -04:00
Brad King d11a19528e Merge topic 'fix-clang-cross-compile-find-binutils' 
72d66818 Fix finding binutils when cross-compiling with Clang
 2014-09-08 12:57:01 -04:00
Kitware Robot 1251c1c8c5 CMake Nightly Date Stamp 2014-09-08 00:01:07 -04:00
Kitware Robot c4f447aec9 CMake Nightly Date Stamp 2014-09-07 00:01:07 -04:00
Kitware Robot 1fa2f43c2b CMake Nightly Date Stamp 2014-09-06 00:01:08 -04:00
Brad King d2364f15ae Merge branch 'fix-clang-cross-compile-find-binutils' into release 2014-09-05 12:06:52 -04:00
Brad King 72d6681826 Fix finding binutils when cross-compiling with Clang 
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".
 2014-09-05 12:06:27 -04:00
Kitware Robot ff1fddb0bf CMake Nightly Date Stamp 2014-09-05 00:01:13 -04:00
Brad King 103ddca336 Merge topic 'fix-gtk2-missing-optional-includes' 
cb8f0f7c FindGTK2: Fix missing optional include dirs.
 2014-09-04 10:03:54 -04:00
Brad King f1fcc7d8c3 Merge branch 'release' 2014-09-04 09:51:02 -04:00
Brad King ecf43f0dc7 Merge topic 'doc-add_custom_command-multiple-commands' 
412926d0 Help: Clarify add_custom_command multiple command behavior (#15112)
 2014-09-04 09:48:32 -04:00
Brad King 0ad4f28fc0 Merge topic 'doc-try_compile-debug-advice' 
abbe91c5 Help: Clarify --debug-trycompile usage with try_compile
 2014-09-04 09:48:30 -04:00
Brad King f7c44eac4c Merge topic 'xcode-duplicate-file-refs' 
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)
 2014-09-04 09:48:27 -04:00
Brad King 1dbb46483a Merge topic 'xcode-assetcatalog-folder-type' 
8eacc339 Xcode: Reference '.xcassets' folders as assetcatalog (#15125)
02aa5965 Xcode: Refactor internal file type extension extraction
 2014-09-04 09:48:22 -04:00
Brad King 44e6612fdc Merge topic 'bash-complete-ctest-labels' 
2603e128 bash-completion: Complete 'ctest' label names
 2014-09-04 09:48:20 -04:00
Brad King 9651cb70ae Merge topic 'InstallRequiredSystemLibraries-vs-openmp' 
d538c55e Help: Add notes for topic 'InstallRequiredSystemLibraries-vs-openmp'
bdb5007b InstallRequiredSystemLibraries: Install OpenMP runtime libs (#15117)
 2014-09-04 09:48:17 -04:00
Brad King 88400e5c5b Merge topic 'vim-syntax' 
ce540aea cmake-syntax.vim: Update the command list
 2014-09-04 09:48:15 -04:00
Brad King 1e88ab62e8 Merge topic 'wix-log-on-failure' 
4952030c CPackWiX: Attach wix.log on test failure.
 2014-09-04 09:48:13 -04:00
Brad King d538c55ea4 Help: Add notes for topic 'InstallRequiredSystemLibraries-vs-openmp' 2014-09-04 09:44:49 -04:00
Lukáš Lalinský ce540aea23 cmake-syntax.vim: Update the command list 2014-09-04 09:39:24 -04:00
Kitware Robot 13e4e0a831 CMake Nightly Date Stamp 2014-09-04 00:01:07 -04:00
Chuck Atkins cb8f0f7c81 FindGTK2: Fix missing optional include dirs. 
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.
 2014-09-03 23:25:57 -04:00
Chuck Atkins 3e84e78c3f Use a more reliable regex for extracting binary INFO strings 
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.
 2014-09-03 17:00:48 -04:00
Sylvain Joubert 2603e12881 bash-completion: Complete 'ctest' label names 2014-09-03 14:56:13 -04:00
Brad King d73f8828ca Merge branch 'backport-xcode-duplicate-file-refs' into xcode-duplicate-file-refs 
Resolve conflicts in Source/cmGlobalXCodeGenerator.cxx in favor of our
side.
 2014-09-03 13:06:01 -04:00
Brad King a1eb90c85d Merge branch 'backport-xcode-duplicate-file-refs' into release 2014-09-03 13:04:41 -04:00
Brad King cf92fe2d84 Xcode: Generate per-target file references (#15111) 
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.
 2014-09-03 12:48:53 -04:00
Brad King e7114226e6 Xcode: Generate per-target file references (#15111) 
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.
 2014-09-03 12:45:37 -04:00
Alan W. Irwin abbe91c58c Help: Clarify --debug-trycompile usage with try_compile 
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.
 2014-09-03 11:19:52 -04:00
Brad King 8eacc3390a Xcode: Reference '.xcassets' folders as assetcatalog (#15125) 2014-09-03 10:33:50 -04:00
Brad King 02aa5965e6 Xcode: Refactor internal file type extension extraction 
Move it earlier so it can be used for directories too.
 2014-09-03 10:33:12 -04:00
Kitware Robot fb8acb74e8 CMake Nightly Date Stamp 2014-09-03 00:01:08 -04:00
Brad King 412926d03a Help: Clarify add_custom_command multiple command behavior (#15112) 
Explicitly say that the commands are not composed into a stateful
script.
 2014-09-02 15:13:50 -04:00
Gregory Sharp bdb5007b17 InstallRequiredSystemLibraries: Install OpenMP runtime libs (#15117) 
Add option CMAKE_INSTALL_OPENMP_LIBRARIES to control the behavior.
 2014-09-02 11:07:32 -04:00
Brad King 68a1d429b1 Merge topic 'fix-liblzma-build-on-solaris-suncc' 
c16d8c7f liblzma: Added a missing config check for _Bool
 2014-09-02 10:59:52 -04:00
Brad King 3338b2c3c8 Merge topic 'ctest-help-fix' 
6767660f CTest: Add missing space in command line help.
 2014-09-02 10:43:21 -04:00
Brad King 85e39553fb Merge topic 'fix-findpostgres-for-multilib' 
741f29cc FindPostgreSQL: Fix for pg_config in multilib configurations.
 2014-09-02 10:43:19 -04:00
Brad King 3db5e31ec1 Merge topic 'string-uuid' 
87e476e8 Help: Add notes for topic 'string-uuid'
328e8694 StringUuid: Implement new string(UUID) sub-command.
 2014-09-02 10:43:16 -04:00
Brad King 14cdf5971e Merge topic 'asm-user-override-files' 
487f147f Load CMAKE_USER_MAKE_RULES_OVERRIDE[_ASM] for assembler (#15108)
 2014-09-02 10:43:14 -04:00