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

25623 Commits

Author SHA1 Message Date
Brad King 29bd843e8b CTest: Use -A option to pass generator platform selection 
This is less verbose than defining CMAKE_GENERATOR_PLATFORM.
 2014-09-15 10:26:59 -04:00
Brad King eb7d815649 cmake: Add -A option to specify a generator platform 
Define the 'cmake -A' option to set CMAKE_GENERATOR_PLATFORM
without having to spell out the whole variable name.  We choose
the name '-A' for "platform" because '-P' is already taken, and
in the common use case the "platform" is actually an architecture
(e.g. x64).

Teach the RunCMake test infrastructure to use -A to pass the generator
platform.  Extend the RunCMake.GeneratorPlatform test with a case to
verify that the -A option cannot be repeated.
 2014-09-15 10:26:59 -04:00
Ruslan Baratov 30a94eecdb ExternalProject: Fix download retry logic 
Do not check file's hash in download script.  If hash will not match
command ``file(DOWNLOAD ...)`` will fail with FATAL_ERROR, ``cmake -P``
will exit with unsuccessful code, and the build will stop.  Leave hash
checking to the existing implementation in the verify step.
 2014-09-15 09:08:33 -04:00
Kitware Robot 78884b6eff CMake Nightly Date Stamp 2014-09-15 00:01:07 -04:00
Kitware Robot 5ed4ee4e5e CMake Nightly Date Stamp 2014-09-14 00:01:07 -04:00
Kitware Robot 2770b19f4c CMake Nightly Date Stamp 2014-09-13 00:01:13 -04:00
Andrew Bauer d805498701 Help: Fix set_tests_properties documentation typo 
The example for FAIL_REGULAR_EXPRESSION should actually name it.
 2014-09-12 11:32:50 -04:00
Kitware Robot 453f20d893 CMake Nightly Date Stamp 2014-09-12 00:01:14 -04:00
Brad King 858d5a0b3e Fix if() checks of CMAKE_SYSTEM_NAME on Cygwin 
The CMAKE_SYSTEM_NAME is "CYGWIN", but we also define a variable
named "CYGWIN" to "1".  Avoid allowing if() to expand the "CYGWIN"
string as a variable.
 2014-09-11 21:23:24 +02:00
Brad King e177e7affb FPHSA: Avoid if() dereferencing of quoted variable 
Legacy invocations may pass a variable name where "DEFAULT_MSG" belongs.
When comparing FPHSA_FAIL_MESSAGE to "DEFAULT_MSG", use a leading "x" on
both sides to avoid mistaking the value of the message for a variable
name.
 2014-09-11 21:23:24 +02:00
Brad King 425acc522f cmcurl: Use if(DEFINED) to simplify conditions 
Replace old hacks of the form 'if("${VAR}" MATCHES "^${VAR}$")'
with the much simpler 'if(NOT DEFINED ${VAR})'.
 2014-09-11 21:23:24 +02:00
Brad King cede5cbd53 libarchive: Avoid depending on if() to dereference a quoted variable 2014-09-11 21:23:24 +02:00
Brad King 2d97178b30 FindGTK2: Avoid depending on if() to dereference a quoted variable 
Explicitly dereference GTK2_${_var}CONFIG_INCLUDE_DIR and
GTK2_${_var}_INCLUDE_DIR when comparing their values.
 2014-09-11 21:23:24 +02:00
Brad King 0b12815dc2 Modules/Test*.cmake: Use if(DEFINED) to simplify conditions 
Replace old hacks of the form 'if("${VAR}" MATCHES "^${VAR}$")'
with the much simpler 'if(NOT DEFINED ${VAR})'.
 2014-09-11 21:23:24 +02:00
Nils Gladitz 188a1f236e If: Introduce policy CMP0054 - don't dereference quoted variables in if() 2014-09-11 21:23:17 +02:00
Nils Gladitz b900c1ccaa If: Extract cmConditionEvaluator from if() implementation 2014-09-11 21:17:09 +02:00
Brad King b36a795163 Merge topic 'doc-check-results-cached' 
908c7439 Help: Document that the CHECK_* macros create cache variables
 2014-09-11 12:55:10 -04:00
Brad King 162cd309b0 Merge topic 'doc-WINCE-var' 
4b4555de Help: Document the WINCE variable
 2014-09-11 12:55:07 -04:00
Brad King efe093dcfd Merge topic 'fix-gnu-hurd-host-detection' 
89d7a5a4 Fix CMAKE_HOST_SYSTEM_PROCESSOR detection on GNU/Hurd (#15147)
 2014-09-11 12:55:05 -04:00
Brad King 527dfe2a4f Merge branch 'release' 2014-09-11 09:11:13 -04:00
Sebastian Leske 908c74399a Help: Document that the CHECK_* macros create cache variables 
Otherwise callers may expect to be able to re-use result variables.
 2014-09-11 08:55:26 -04:00
Pascal Bach 4b4555de3e Help: Document the WINCE variable 2014-09-11 08:44:20 -04:00
Kitware Robot 28012f3eef CMake Nightly Date Stamp 2014-09-11 00:01:08 -04:00
Brad King 0a92b23c52 Merge topic 'vs-generator-platform' 
09c8ad99 enable_language: Initialize system-specific generator info only once
09ab207c Tests: Add generator platform support
6944997b ExternalProject: Propagate the generator platform
8d332091 CTest: Add options to set generator platform
b97736a2 VS: Implement CMAKE_GENERATOR_PLATFORM for VS >= 8
0f1f1271 CMake: Add CMAKE_GENERATOR_PLATFORM option
4f7d0c42 Help: Document CMAKE_VS_PLATFORM_NAME variable
68d4280a VS: Refactor internal default platform name selection
ad2a4776 cmGlobalVisualStudio10Generator: Re-order some methods
03b7b6cd cmGlobalGenerator: Call SetGeneratorToolset even for empty toolset
 2014-09-10 11:23:22 -04:00
Brad King 2bfe48d6af Merge topic 'update-kwsys' 
daab3b3b Merge branch 'upstream-kwsys' into update-kwsys
92b582a6 KWSys 2014-09-08 (fb77be5a)
 2014-09-10 11:23:20 -04:00
Brad King 81b2a250dc Merge topic 'FindIce-updates' 
2131aedd FindIce: Respect Ice_FIND_QUIETLY when printing messages
d5047ca1 FindIce: Remove unneeded search path modification
 2014-09-10 11:23:17 -04:00
Brad King 3d290c111a Merge topic 'string-uuid-doc-fix' 
e6ba52e8 StringUuid: Mark UPPER flag optional in sub-command synopsis
 2014-09-10 11:23:15 -04:00
Brad King cd0ead3c94 Merge topic 'tolerate-lib-dir-symlink' 
f99cc9c3 Tolerate symlinks during RPATH ordering (#13429)
 2014-09-10 11:23:12 -04:00
Brad King 09c8ad9943 enable_language: Initialize system-specific generator info only once 
Call SetSystemName, SetGeneratorPlatform, and SetGeneratorToolset
exactly once after reading CMakeSystem.cmake, and not again on another
call to enable_language() or project().
 2014-09-10 11:21:51 -04:00
Brad King 09ab207c66 Tests: Add generator platform support 
Propagate CMAKE_GENERATOR_PLATFORM through the test hierarchy so that all
tests can build with the selected generator platform, if any.
 2014-09-10 11:21:50 -04:00
Nils Gladitz e6ba52e8e0 StringUuid: Mark UPPER flag optional in sub-command synopsis 2014-09-10 16:10:13 +02:00
Felix Geyer 89d7a5a417 Fix CMAKE_HOST_SYSTEM_PROCESSOR detection on GNU/Hurd (#15147) 
On Debian GNU/Hurd 'uname -p' prints "unknown", so use 'uname -m'
instead.
 2014-09-10 09:06:33 -04:00
Kitware Robot e03b474fa8 CMake Nightly Date Stamp 2014-09-10 00:01:10 -04:00
Roger Leigh 2131aeddaa FindIce: Respect Ice_FIND_QUIETLY when printing messages 2014-09-09 15:19:00 -04:00
Roger Leigh d5047ca1b2 FindIce: Remove unneeded search path modification 
Drop code adding redundant "/opt/Ice-${ice_version}" paths.
 2014-09-09 11:45:51 -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
Brad King daab3b3bdf Merge branch 'upstream-kwsys' into update-kwsys 2014-09-09 08:46:41 -04:00
KWSys Robot 92b582a67e KWSys 2014-09-08 (fb77be5a) 
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
 2014-09-09 08:46:34 -04:00
Kitware Robot a06e49cf10 CMake Nightly Date Stamp 2014-09-09 00:01:10 -04:00
Brad King 4811915367 CMake 3.0.2 2014-09-08 16:39:08 -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