17063 Commits

Author SHA1 Message Date
Ben Boeckel
fb13502fca QtDialog: install the 128x128 icon
Also only install the icons to the icons directory.
2014-10-29 11:47:29 -04:00
Ben Boeckel
fcb4541a05 QtDialog: don't install desktop file bits on Apple
Apple uses the dmg file which doesn't have .desktop support.
2014-10-29 11:38:48 -04:00
Brad King
e51cd32de3 Merge topic 'add_javascript_coverage_parser'
220e8134 CTest: Add Javascript coverage parser
2014-10-29 11:31:10 -04:00
Joseph Snyder
220e81345b CTest: Add Javascript coverage parser
Add a coverage parser for the Blanket.js library using the JSON output of
the mocha.js test runner.

Add a test for the new parser.
2014-10-29 11:27:11 -04:00
Kitware Robot
8451f12350 CMake Nightly Date Stamp 2014-10-29 00:01:14 -04:00
André Klitzing
bd3fbf36b4 CPack: Add support for code signing of bundles on MacOS 2014-10-28 12:20:05 -06:00
Kitware Robot
f1ac5ba5e8 CMake Nightly Date Stamp 2014-10-28 00:01:10 -04:00
Brad King
a2456e1572 Merge topic 'autorcc-depends'
6e1c359f QtAutogen: Regenerate qrc files if their input changes (#15074)
a2995318 QtAutogen: Expand rccfiles into a vector early in the autogen process.
506151af QtAutogen: Extract a GetRccExecutable method.
2014-10-27 11:29:17 -04:00
Brad King
8eb64831be Merge topic 'revert-definition-map-lookup'
d1b62185 Merge branch 'parent-scope-tests' into variable-pull-failure
5f414cef Revert "cmDefinitions: Don't store parent lookups"
e0c0b1ac test: add a test for PARENT_SCOPE with multiple scopes
064c415d test: add test for PARENT_SCOPE behavior
2014-10-27 08:32:26 -04:00
Kitware Robot
21cf9364f0 CMake Nightly Date Stamp 2014-10-27 00:01:08 -04:00
Kitware Robot
373b625e4f CMake Nightly Date Stamp 2014-10-26 00:01:07 -04:00
Kitware Robot
97eb511672 CMake Nightly Date Stamp 2014-10-25 00:01:10 -04:00
Stephen Kelly
6e1c359fe9 QtAutogen: Regenerate qrc files if their input changes (#15074)
Get dependencies from the output of ``rcc --list`` if using
Qt 5.  Otherwise process the file in the same way as the
qt4_add_resources macro.

This does not work for RCC files which are generated.

The cmake_autogen build step is implemented as a PRE_BUILD step
of the target currently if possible, rather than a standalone
custom target.  This is to keep the number of (synthesized)
custom targets that appear in the UI low, but in some cases
it is necessary to fall back to a full custom target.

Fall back to a full custom target for the VS builds if autorcc
is used.
2014-10-24 19:45:27 +02:00
Brad King
0c3ddf8b65 Merge branch 'revert-definition-map-lookup' into release 2014-10-24 13:38:32 -04:00
Ben Boeckel
5f414cefb6 Revert "cmDefinitions: Don't store parent lookups"
This reverts commit 5abfde6cb8a1ae0b2825797eab6c2e9842eb7c49.

The behaviors associated with implicit pulldown on variable lookup
seriously conflict with the optimizations made in these commits.
Basically, since values were copied upon variable lookup, not just on
PARENT_SCOPE, coupled with PARENT_SCOPE's behavior based on whether the
variable is in the current scope or not causes serious problems with not
storing a value for every variable at every scope.

The commit changed behavior of the following example, among other cases:

  function(test_set)
    set(blah "value2")
    message("before PARENT_SCOPE blah=${blah}")
    set(blah ${blah} PARENT_SCOPE)
    message("after PARENT_SCOPE blah=${blah}")
  endfunction()
  set(blah value1)
  test_set()
  message("in parent scope, blah=${blah}")

Reported-by: Alex Merry <alex.merry@kde.org>
Reported-by: Ben Cooksley <bcooksley@kde.org>
2014-10-24 13:31:21 -04:00
Kitware Robot
fbc2a384d8 CMake Nightly Date Stamp 2014-10-24 00:01:08 -04:00
Stephen Kelly
a29953180c QtAutogen: Expand rccfiles into a vector early in the autogen process.
This can be re-used as a vector.
2014-10-23 20:35:26 +02:00
Stephen Kelly
506151af51 QtAutogen: Extract a GetRccExecutable method. 2014-10-23 20:35:25 +02:00
Kitware Robot
0213e6944e CMake Nightly Date Stamp 2014-10-23 00:01:13 -04:00
Kitware Robot
fc9041d024 CMake Nightly Date Stamp 2014-10-22 00:01:10 -04:00
Brad King
210230e216 Merge topic 'remove-borland-build'
2db55ffa Remove borland workarounds.
2014-10-21 15:08:03 -04:00
Brad King
ae5686f8d0 Merge topic 'remove-redundant-c_str'
cc1139cc strings: Remove redundant calls to std::string::c_str()
2014-10-21 15:08:01 -04:00
Brad King
4f9fcd356b Merge topic 'ctest-delphi-coverage'
5c31c3e4 CTest: Add code coverage parser for Pascal/Delphi
2014-10-21 15:07:58 -04:00
Joseph Snyder
5c31c3e4eb CTest: Add code coverage parser for Pascal/Delphi
Add a class to parse the HTML output of the Delphi-code-coverage tool

 http://code.google.com/p/delphi-code-coverage/

Add a test for the new parser.
2014-10-21 15:02:20 -04:00
Kitware Robot
ef6ce1f87e CMake Nightly Date Stamp 2014-10-21 00:01:09 -04:00
Ben Boeckel
aee7e4a03b cmCacheManager: parse -D flags more strictly
In the case of:

    -DCACHE_VARS=-DEXTERNAL_PROJECT_CMAKE_ARG:BOOL=TRUE

the variable is parsed out as:

    CACHE_VARS=-DEXTERNAL_PROJECT_CMAKE_ARG

because the parser allows '=' in the variable name. Disallow such a name
on the command line.
2014-10-20 12:17:19 -04:00
Kitware Robot
a3eeaa63ae CMake Nightly Date Stamp 2014-10-20 00:01:07 -04:00
Kitware Robot
a14c449a90 CMake Nightly Date Stamp 2014-10-19 00:01:07 -04:00
Kitware Robot
d4525d7288 CMake Nightly Date Stamp 2014-10-18 00:01:07 -04:00
Kitware Robot
6b698bd29f CMake Nightly Date Stamp 2014-10-17 00:01:11 -04:00
Kitware Robot
1d86036df8 CMake Nightly Date Stamp 2014-10-16 00:01:12 -04:00
Stephen Kelly
2db55ffa56 Remove borland workarounds.
CMake 3.0 is the last release to require to be able to build with
Borland.
2014-10-15 23:16:44 +02:00
Nils Gladitz
cc1139cc30 strings: Remove redundant calls to std::string::c_str()
Replacements were detected and performed by the clang tool
remove-cstr-calls on a linux build.
2014-10-15 14:54:05 +02:00
Kitware Robot
1b3495d32e CMake Nightly Date Stamp 2014-10-15 00:01:14 -04:00
Brad King
a7596fef6e Begin post-3.1 development 2014-10-14 09:29:53 -04:00
Brad King
517e3cd157 CMake 3.1.0-rc1 version update 2014-10-14 09:22:34 -04:00
Brad King
19f87a73bd Merge topic 'fix-comment-typos'
bef23e81 Fix some spelling errors in comments
2014-10-14 09:20:11 -04:00
Kitware Robot
54ff77dc62 CMake Nightly Date Stamp 2014-10-14 00:01:08 -04:00
Geoff Viola
bef23e8181 Fix some spelling errors in comments 2014-10-13 10:00:53 -04:00
Brad King
cea13d5536 Merge topic 'fix-ninja-rc-include-flags'
f4c5eade Ninja: Fix RC include directories regression
2014-10-13 08:21:04 -04:00
Brad King
f4c5eade78 Ninja: Fix RC include directories regression
Changes in commit b9aa5041 (cmLocalGenerator: Simplify GetIncludeFlags
output formatting, 2014-03-04) caused Windows Resource Compiler include
directories to be computed as relative paths in the Ninja generator.
This breaks the cmcldeps handling of include paths.  The reason for the
regression is that several cmLocalGenerator::GetIncludeFlags callers
treated the fourth "bool forResponseFile" argument as if it controlled
whether include directories were a full path.  It actually did control
that by accident until the above commit.

Add an explicit "bool forceFullPaths" argument to GetIncludeFlags
and thread the value through ConvertToIncludeReference as needed.
Update GetIncludeFlags call sites that really wanted to control the
forResponseFile setting to be aware of the new argument.  Extend the
VSResource test to cover this case.
2014-10-13 08:20:05 -04:00
Kitware Robot
c11a342e65 CMake Nightly Date Stamp 2014-10-13 00:01:07 -04:00
Kitware Robot
96579778d1 CMake Nightly Date Stamp 2014-10-12 00:01:07 -04:00
Kitware Robot
8189d53127 CMake Nightly Date Stamp 2014-10-11 00:01:15 -04:00
Brad King
26bffa6e74 Merge topic 'fix-OSX-bundle-rpaths-and-Qt5'
631fadea Help: Add notes for topic 'fix-OSX-bundle-rpaths-and-Qt5'
50e261dd OSX: Warn when attempting to change runtime paths on OS X 10.5
9b98fd52 cmake-gui: Make sure we bundle Qt5 Cocoa platform plugin
83a06bb4 BundleUtilities: Framework codesign Resources/Info.plist & Current
f7df82ac BundleUtilities: Resolve & replace @rpath placeholders
14bc686f GetPrerequisites: Make sure dyld placeholders are prefixes
6c313797 BundleUtilities: Use find on UNIX for fast executable lookup
2014-10-10 10:55:44 -04:00
Clinton Stimpson
50e261ddb6 OSX: Warn when attempting to change runtime paths on OS X 10.5
Even though 10.5 supports @rpath, the support is not complete
enough for CMake.  For instance, install_name_tool doesn't support
adding and removing rpaths.

Also modifying BundleUtilities test to remove an undesirable cmake
generated runtime path.  The intent was to build with the install
rpath as is done with the other cases in this test.
2014-10-10 10:17:27 -04:00
Adam Strzelecki
9b98fd528d cmake-gui: Make sure we bundle Qt5 Cocoa platform plugin
Otherwise CMake.app bundle will not run when using Qt5.
2014-10-10 10:17:18 -04:00
Kitware Robot
5ab9aa62fe CMake Nightly Date Stamp 2014-10-10 00:01:09 -04:00
Brad King
4c02746372 Merge topic 'ninja-phony-rules-only-in-build-tree'
de8e534b Ninja: Limit custom command side-effects to build folder
2014-10-09 16:12:01 -04:00
Kitware Robot
a358448d3e CMake Nightly Date Stamp 2014-10-09 00:01:08 -04:00