Commit Graph

26527 Commits

Author SHA1 Message Date
Brad King 4cc2d9b3a6 Merge branch 'FindIce-no-envvar-markup' into release 2014-11-03 11:39:13 -05:00
Brad King 01fb3190f2 FindIce: Drop use of :envvar: Sphinx markup
We do not use it elsewhere yet, and do not want to index environment
variables inconsistently.
2014-11-03 10:53:47 -05:00
Daniele E. Domenichelli 67cfbf8eb7 ExternalProject: Add unit tests 2014-11-03 16:15:14 +01:00
Daniele E. Domenichelli f598f1aa83 ExternalProject: Add ExternalProject_Add_StepDependencies function
The ExternalProject_Add_StepDependencies function add some dependencies
for some external project step.

The syntax is:
 ExternalProject_Add_Step_Dependencies(<name> <step> [target1 [target2 [...]]])

This function takes care to set both target and file level dependencies,
and will ensure that parallel builds will not break.

It should be used instead of add_dependencies() when adding a dependency
for some of the step targets generated by ExternalProject. See also:
http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/8680/focus=8926
2014-11-03 16:15:14 +01:00
Daniele E. Domenichelli 4ae133e09c ExternalProject: Add independent step targets
When adding step targets using ExternalProject_Add_StepTargets, the
STEP_TARGETS argument or the EP_STEP_TARGETS property, ExternalProject
sets all the dependencies for the main project to that target.  Due to
this, the update target cannot be used without downloading and building
all the dependencies.

In order to be able to add step targets that do not depend on other
external projects, this patch adds:

* An optional "NO_DEPENDS" argument to the
  ExternalProject_Add_StepTargets function. If this argument is set,
  then no dependencies are set for the target (file dependencies will
  still be set).

* A new argument INDEPENDENT_STEP_TARGETS to the ExternalProject_Add
  function and a new directory property EP_INDEPENDENT_STEP_TARGETS that
  behave like STEP_TARGETS and EP_STEP_TARGETS, but cause the
  ExternalProject_Add_StepTargets to be called with the NO_DEPENDS
  argument.
2014-11-03 16:15:14 +01:00
Brad King 40bab8d17b Merge branch 'release' 2014-11-03 09:36:40 -05:00
Brad King 1ee161cf26 Merge branch 'watcom-drop-symfile-option' into release 2014-11-03 09:36:25 -05:00
Brad King a72ff020db Merge branch 'fix-configure_file-COPYONLY' into release 2014-11-03 09:35:34 -05:00
Christian Manning eaf6f67f67 Code Blocks/Eclipse: Add -std= flag matching.
When -std=x is specified in CMAKE_CXX_FLAGS this passes it along.
2014-11-03 09:19:18 -05:00
Christian Manning 45a25d63ba Code Blocks/Eclipse: Use non-default stdlib includes when specified.
When -stdlib=x is specified in CMAKE_CXX_FLAGS this passes it along so
that the correct include dirs are detected.
2014-11-03 09:18:44 -05:00
Brad King 6aa2d47737 Merge topic 'fix-configure_file-COPYONLY'
1531df2b configure_file: Warn about unknown arguments
4abbb140 Qt4: Fix configure_file call to use COPYONLY, not COPY_ONLY
bd7ba8e2 KWSys: Fix configure_file call to use COPYONLY, not COPY_ONLY
e9282782 Help: Fix configure_file call to use COPYONLY, not COPY_ONLY
2014-11-03 09:08:35 -05:00
J Decker 6b63942e45 Watcom: Drop symfile linker option
Cleanup of Windows-wcl386.cmake in commit v3.1.0-rc1~693^2 (Watcom:
Cleanup Windows-wcl386 configuration, 2014-04-01) also introduced use of
the 'symfile' link option but did not mention it in the commit message.

There is no way to set the symbol file name of a target, so it is better
to revert that change.  It is easy to run 'wstrip *' if the symbols need
to be stripped, but it is very difficult to get the right names for the
.sym files to install with debug/rel_with_deb_info configurations.
2014-11-03 08:46:48 -05:00
Kitware Robot 44853be608 CMake Nightly Date Stamp 2014-11-03 00:01:07 -05:00
Kitware Robot 5755d0059a CMake Nightly Date Stamp 2014-11-02 00:01:07 -04:00
Kitware Robot b25a200204 CMake Nightly Date Stamp 2014-11-01 00:01:14 -04:00
Brad King 1531df2b86 configure_file: Warn about unknown arguments
Extend the RunCMake.configure_file test with a case covering possible
common typos of the COPYONLY option.

Reported-by: Iosif Neitzke <iosif.neitzke@gmail.com>
2014-10-31 13:21:21 -04:00
Brad King 4abbb1400d Qt4: Fix configure_file call to use COPYONLY, not COPY_ONLY 2014-10-31 13:20:19 -04:00
Brad King bd7ba8e25f KWSys: Fix configure_file call to use COPYONLY, not COPY_ONLY 2014-10-31 13:20:19 -04:00
Iosif Neitzke e9282782e4 Help: Fix configure_file call to use COPYONLY, not COPY_ONLY
The configure_file signature has option 'COPYONLY' (no underscore).
Fix the example in 'cmake-packages.7.rst'.
2014-10-31 13:19:33 -04:00
Brad King 5868b4e2fb Merge branch 'upstream-kwsys' into update-kwsys 2014-10-31 13:11:58 -04:00
KWSys Robot 72b5b48040 KWSys 2014-10-31 (88c8cc7f)
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ 88c8cc7f | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 29ffaf43..88c8cc7f
Ben Boeckel (11):
      9bf03363 Avoid if() quoted auto-dereference
      771e0f22 DynamicLoader: use strings for arguments
      86e20d68 Directory: remove extra define
      6cc24510 SystemTools: use strings in environment functions
      bab5b1f2 SystemTools: add string overload for ReplaceString
      f3fb01cf SystemTools: use strings for path-related APIs
      0dfbe56d SystemTools: use strings for making C identifiers
      4690fc8d SystemTools: use strings in registry function
      1b762a41 SystemTools: search for characters
      4a060347 SystemInformation: use %ls for WCHAR* format specifiers
      d31f7b12 SystemTools: remove unused variable

Brad King (1):
      88c8cc7f Fix configure_file call to use COPYONLY, not COPY_ONLY

Clinton Stimpson (1):
      5bf91dda SystemTools:  Use extended length path for copying files.

Change-Id: I16e8e55dea1c171c04f9c7d04ae3c575531097c3
2014-10-31 13:11:53 -04:00
Brad King 8b16e62c7a Merge branch 'release' 2014-10-31 11:39:23 -04:00
Brad King aa0f6e8309 Merge branch 'doc-add_library-typo' into release 2014-10-31 11:38:36 -04:00
Brad King 0b8db9ced1 Merge topic 'ExternalProject_CMAKE_CACHE_DEFAULT_ARGS'
609037f4 ExternalProject: Add unit tests for CMAKE_CACHE_DEFAULT_ARGS
98cdb658 ExternalProject: Add CMAKE_CACHE_DEFAULT_ARGS arguments
36cf8a1e Tests/Tutorial: Fix when USE_MYMATH is OFF
2014-10-31 11:35:07 -04:00
Brad King f2805bd01b Merge topic 'VERSION_no_sscanf'
ef09df64 cmSystemTools: reimplement verson comparison without sscanf()
667560c8 extend the testing for version comparison
2014-10-31 11:35:06 -04:00
Brad King 14a983cce6 Merge topic 'CheckStructHasMember-avoid-breakage-on-Wall'
8d6ba358 CheckStructHasMember: Avoid clang -Wall breakage (#15203)
2014-10-31 11:35:04 -04:00
Brad King 81441f328b Merge topic 'doc-add_library-typo'
38825396 Documentation: Fix minor typo thecommand -> the command
2014-10-31 11:35:02 -04:00
Brad King 163868b311 Merge topic 'xcode-inherit-warning-flags'
820e95d0 Xcode: Inherit global settings in per-target WARNING_CFLAGS (#15224)
2014-10-31 11:34:58 -04:00
Daniele E. Domenichelli 609037f482 ExternalProject: Add unit tests for CMAKE_CACHE_DEFAULT_ARGS 2014-10-31 11:34:11 -04:00
Daniele E. Domenichelli 98cdb658e4 ExternalProject: Add CMAKE_CACHE_DEFAULT_ARGS arguments
This argument allows to set default arguments that are written in the
initial cache file, but that are not forced, and therefore allows the
user to change these values later (CMAKE_ARGS and CMAKE_CACHE_ARGS
always overwrite the values).

Also add some documentation to explain the differences between these 3
arguments.

Extend ExternalProjectLocal test to cover CMAKE_CACHE_DEFAULT_ARGS.
2014-10-31 11:34:04 -04:00
Daniele E. Domenichelli 36cf8a1eb9 Tests/Tutorial: Fix when USE_MYMATH is OFF
Unit tests for the square root of "-25" currently fail when USE_MYMATH
is disabled. The "mysqrt" method in the tutorials, returns "0" for a
negative value, while "sqrt" returns "NaN", and therefore the output is
not accepted by the test.

This patch checks if the number is negative and eventually returns "0"
before calling "sqrt" or "mysqrt" to fix this issue.

Printing a NaN might cause issues with the string catched by the tests
on some platform. Therefore assume that "0" is correct and "fix" the
USE_MYMATH=OFF version by checking if the number is negative and
eventually returning "0" before calling "sqrt" or "mysqrt".
2014-10-31 11:32:24 -04:00
Rolf Eike Beer ef09df646a cmSystemTools: reimplement verson comparison without sscanf()
This now has the advantage that it works with version strings with any number
of components.
2014-10-31 11:31:31 -04:00
Brad King 820e95d000 Xcode: Inherit global settings in per-target WARNING_CFLAGS (#15224)
Allow projects to use CMAKE_CODE_ATTRIBUTE_WARNING_CFLAGS to add their
own warning flags and have them used by the targets.
2014-10-31 11:29:53 -04:00
Nils Gladitz 38825396f9 Documentation: Fix minor typo thecommand -> the command 2014-10-31 11:27:50 -04:00
Kitware Robot f274597abb CMake Nightly Date Stamp 2014-10-31 00:01:08 -04:00
Peter Wu 8d6ba35827 CheckStructHasMember: Avoid clang -Wall breakage (#15203)
With CMAKE_C_COMPILER=clang and CMAKE_C_FLAGS='-Wall -Werror', this test
breaks with -Werror,-Wuninitialized.  Fix this by getting rid of the
temporary variable.
2014-10-30 14:16:06 -04:00
Brad King f2746f2ebe Merge topic 'dev/alternate-generator-binaries'
f04e0a2b ninja: Find alternate Ninja-compatible binaries
2014-10-30 14:11:59 -04:00
Brad King 5e27e6f896 Merge topic 'doc-add_compile_options'
352cbb6e Help: Reference add_compile_options from add_definitions (#15225)
a9f8c50a Help: Clarify add_compile_options documentation (#15225)
2014-10-30 14:11:57 -04:00
Brad King b233a09f6e Merge topic 'unix-icon-install'
fb13502f QtDialog: install the 128x128 icon
fcb4541a QtDialog: don't install desktop file bits on Apple
2014-10-30 14:11:56 -04:00
Brad King 927b59403f Merge topic 'doc-fix-html-favicon'
ca83c39c Utilities/Sphinx: Fix html_favicon configuration
2014-10-30 14:11:53 -04:00
Brad King 6e1e7dd014 Merge topic 'wince-tests'
5bd29b88 Tests: Run Tutorial steps 1-4 as tests for Windows CE
2014-10-30 14:11:51 -04:00
Brad King 89fd4b82d1 Merge topic 'cpack-bundle-codesign'
bd3fbf36 CPack: Add support for code signing of bundles on MacOS
2014-10-30 14:11:50 -04:00
Brad King 2e953c7657 Merge topic 'fix--D-command-line-parsing'
aee7e4a0 cmCacheManager: parse -D flags more strictly
368e8de4 Tests: test -D parsing on the command line
2014-10-30 14:11:48 -04:00
Brad King 5924270273 curl: Simplify if() conditions on check result variables
Remove use of an old hack that takes advantage of the auto-dereference
behavior of the if() command to detect if a variable is defined.  The
hack has the form:

 if("${VAR} MATCHES "^${VAR}$")

where "${VAR}" is a macro argument reference.  Use if(DEFINED) instead.
This also avoids warnings for CMake Policy CMP0054.
2014-10-30 11:11:49 -04:00
Kitware Robot 5c5c1e3c7d CMake Nightly Date Stamp 2014-10-30 00:01:08 -04:00
Brad King 8d311a813c curl: Remove outdated Haiku preprocessor checks
Re-apply change from commit v3.0.0-rc1~541^2~1 (Haiku: Remove outdated
preprocessor checks, 2013-10-05) on updated upstream curl.
2014-10-29 16:43:49 -04:00
Brad King 4063f26b65 curl: Port to Haiku again
Re-apply change from commit v2.8.0~1683 (add initial support for HAIKU
OS, 2008-09-15) on updated upstream curl.  However, leave out the part
that was reverted by commit v3.0.0-rc1~541^2~1 (Haiku: Remove outdated
preprocessor checks, 2013-10-05).
2014-10-29 16:43:45 -04:00
Brad King 53b8df596f curl: Drop '-DEV' from version since this is a curl release
We imported curl from an upstream release, so report the corresponding
release version to servers.  This is consistent with the version we
presented when our builtin curl was 7.16.1.
2014-10-29 16:43:41 -04:00
Brad King 392a318862 curl: Fix spelling errors reported by Lintian
Re-apply change from commit v2.8.3~265^2~1 (Fix spelling errors
reported by Lintian, 2010-07-02) on updated upstream curl.
2014-10-29 16:43:37 -04:00
Brad King 1107eb3df8 curl: Fix warnings on 64-bit Mac OS X build
Re-apply change from commit v2.6.0~921 (Fix warnings on 64-bit Mac OS X
build, 2007-11-05) on updated upstream curl.
2014-10-29 16:43:32 -04:00