24452 Commits

Author SHA1 Message Date
Stephen Kelly
42e1cd137c file(GENERATE): Only write the file if content is different.
No policy is used to control this behavior for now.
2014-04-30 15:18:13 +02:00
Tobias Zirr
231b30dbfb FindCUDA: Add support for compilation to fatbin & cubin modules 2014-04-30 09:02:52 -04:00
Kitware Robot
b0e955f129 CMake Nightly Date Stamp 2014-04-30 00:01:07 -04:00
Ben Boeckel
3f51752264 StoreMatches: Minor cleanups 2014-04-29 16:00:06 -04:00
Ben Boeckel
ef62fbad55 ClearMatches: Store match variable names statically
Constructing the names and then turning them into a std::string is
non-negligible in performance testing.
2014-04-29 16:00:05 -04:00
Ben Boeckel
f718b30a95 ClearMatches: Only clear matches which were actually set
ClearMatches was clearing many variables which were never set in the
first place. Instead, store how many matches were made last time and
only clear those. It is moved to the cmMakefile class since it is a
common utility used by multiple commands.
2014-04-29 16:00:05 -04:00
Brad King
9442928745 Merge topic 'UseSWIG-go-support'
a3b1be5e UseSWIG: Add support for Go and Lua
2014-04-29 09:58:50 -04:00
Brad King
3681cc437d Merge topic 'doc-singlehtml'
aaa6c8a6 Merge branch 'master' into doc-singlehtml
faf291a9 Utilities/Sphinx: Add option to build 'singlehtml' format
2014-04-29 09:58:48 -04:00
Brad King
1b5fac4695 Merge topic 'doc-full-help'
478356e6 Restore --help-full option to output all help manuals
2014-04-29 09:58:46 -04:00
Julien Schueller
a3b1be5e69 UseSWIG: Add support for Go and Lua 2014-04-29 09:56:18 -04:00
Brad King
bbc358c3fc Merge branch 'master' into osx-init-early
Resolve conflict in Source/cmGlobalGenerator.cxx by integrating
changes from both sides.
2014-04-29 09:36:55 -04:00
Brad King
0cce556b5f Xcode: Use sysroot and deployment target to identify compiler
Use CMAKE_OSX_SYSROOT and CMAKE_OSX_DEPLOYMENT_TARGET to set the Xcode
SDKROOT and MACOSX_DEPLOYMENT_TARGET build settings.  This is necessary
because some versions of Xcode select a different compiler based on
these settings.  We need to make sure the compiler identified during
language initialization matches what will be used for the actual build.
2014-04-29 09:36:15 -04:00
Brad King
0200d0a9c4 OS X: Factor a Darwin-Initialize module out of Platform/Darwin
Initialize variables CMAKE_OSX_SYSROOT, CMAKE_OSX_DEPLOYMENT_TARGET, and
CMAKE_OSX_ARCHITECTURES prior to enabling any languages.  This will
allow compiler identification to consider these values.
2014-04-29 09:36:14 -04:00
Brad King
416761e35c Add platform-specific initialization step when enabling languages
Create a Modules/CMakeSystemSpecificInitialize.cmake module loaded after
CMakeSystem.cmake but before per-language initialization.  Use it to
load an optional Platform/<os>-Initialize.cmake module.  This will be
useful to do per-platform initialization that does not depend on the
language and use the results when enabling specific languages.
2014-04-29 09:36:14 -04:00
Kitware Robot
c51d07d439 CMake Nightly Date Stamp 2014-04-29 00:01:08 -04:00
Ben Boeckel
77b3796581 cmSourceFile: Take a string 2014-04-28 21:43:40 -04:00
Ben Boeckel
7b8a990424 perf: Cache the language property string 2014-04-28 21:43:39 -04:00
Ben Boeckel
10baf00f3d cmSourceFile: Cache the isUiFile check
The filename extension call is expensive, so cache the .ui check.
2014-04-28 21:43:39 -04:00
Ben Boeckel
14e7a8ae1c cmSourceFileLocation: Return a string reference 2014-04-28 21:43:27 -04:00
Ben Boeckel
b4cb543e0c cmSourceFileLocation: Save some string copies 2014-04-28 21:43:27 -04:00
Ben Boeckel
e8e1f3a19f cmSourceFileLocation: Simplify logic in Matches 2014-04-28 21:43:26 -04:00
Ben Boeckel
5554910ec2 cmSourceFileLocation: Avoid string allocation in extension checking
The substr call was causing excess allocations. Swap the cheaper
character check to be before the longer string comparison, now using the
prefix checking function.
2014-04-28 21:43:09 -04:00
Kitware Robot
bb1c41a085 CMake Nightly Date Stamp 2014-04-28 00:01:10 -04:00
Kitware Robot
c8b76d58bd CMake Nightly Date Stamp 2014-04-27 00:01:09 -04:00
Kitware Robot
415b75ff37 CMake Nightly Date Stamp 2014-04-26 00:01:06 -04:00
Peter Kümmel
6a5bd7f0da Qt4: write moc parameter file only when content has changed 2014-04-25 18:24:56 +02:00
Rolf Eike Beer
b0f277db38 HP aCC: record compiler flag for Ansi C++98 support for version 3.80 onwards
Old versions of aCC need a special compiler flag to get full C++98 template
support as e.g. CMake itself or the Complex and ComplexOneConfig tests need.
The same versions need a special flag to get a proper C++ library, too.
2014-04-25 17:59:57 +02:00
Brad King
c2f27dadac Merge branch 'doc-singlehtml' into release 2014-04-25 08:43:07 -04:00
Brad King
6293d1ba76 Merge branch 'doc-full-help' into release 2014-04-25 08:43:00 -04:00
Brad King
478356e6d9 Restore --help-full option to output all help manuals
This option was removed during conversion to the reStructuredText
documentation.  Restore it.  Process documentation starting at
Help/index.rst so that all manuals are included in the output.
2014-04-25 08:41:31 -04:00
Kitware Robot
041dfea55b CMake Nightly Date Stamp 2014-04-25 00:01:10 -04:00
Brad King
aaa6c8a6ce Merge branch 'master' into doc-singlehtml
Resolve conflicts in Utilities/Sphinx/CMakeLists.txt by adding the help
options from both sides.
2014-04-24 15:31:45 -04:00
Brad King
faf291a9c4 Utilities/Sphinx: Add option to build 'singlehtml' format
Add SPHINX_SINGLEHTML to enable the Sphinx 'singlehtml' builder.
2014-04-24 15:23:27 -04:00
Brad King
d64ee80d6b Merge branch 'release' 2014-04-24 09:27:06 -04:00
Brad King
20b46a09e3 Merge branch 'sphinx-python3' into release 2014-04-24 09:26:41 -04:00
Brad King
3c8226e590 Merge topic 'sphinx-python3'
d55671ad Utilities/Sphinx: Fix cmake domain document removal with python3
2014-04-24 09:24:59 -04:00
Brad King
9264983b82 Merge topic 'FindGTK2-X11'
55f5ea7b FindGTK2: search for Fontconfig and X11 before using them
2014-04-24 09:24:57 -04:00
Brad King
9b8685f7d0 Merge topic 'aix-streams'
817db64c fix compile error on AIX/gcc-2.9 because of unknown std::stringstream
2014-04-24 09:24:55 -04:00
Brad King
d55671ad9d Utilities/Sphinx: Fix cmake domain document removal with python3
In the domain clear_doc method, avoid removing entries from a dictionary
while iterating over it.  Instead accumulate a set of entries to remove
at the end.
2014-04-24 09:04:52 -04:00
Kitware Robot
533d10e48c CMake Nightly Date Stamp 2014-04-24 00:01:10 -04:00
Rolf Eike Beer
55f5ea7b0e FindGTK2: search for Fontconfig and X11 before using them 2014-04-23 22:49:38 +02:00
Kitware Robot
608532fa2b CMake Nightly Date Stamp 2014-04-23 00:01:11 -04:00
Rolf Eike Beer
817db64c2c fix compile error on AIX/gcc-2.9 because of unknown std::stringstream 2014-04-22 22:21:31 +02:00
Brad King
d3417a270f Merge branch 'release' 2014-04-22 12:54:58 -04:00
Brad King
72ab764582 Merge branch 'osx-CFBundle-info-plist' into release 2014-04-22 12:53:51 -04:00
Brad King
08a5b6b3cb Merge topic 'osx-CFBundle-info-plist'
e4e76f28 Merge branch 'master' into osx-CFBundle-info-plist
149ce5db OS X: Fix Info.plist placement in a CFBundle
2014-04-22 12:53:16 -04:00
Brad King
e4e76f286c Merge branch 'master' into osx-CFBundle-info-plist
Resolve conflict in Source/cmOSXBundleGenerator.cxx by taking
the side from 'master'.
2014-04-22 12:51:55 -04:00
Tim Blechmann
149ce5db5e OS X: Fix Info.plist placement in a CFBundle
Fix cmOSXBundleGenerator::CreateCFBundle to place Info.plist under the
same root directory as the rest of the bundle.  Without this, Info.plist
was placed into CMAKE_BINARY_DIR, not CMAKE_CURRENT_BINARY_DIR because
the target path was not generated correctly.
2014-04-22 12:48:44 -04:00
Kitware Robot
2475acc497 CMake Nightly Date Stamp 2014-04-22 00:01:08 -04:00
Brad King
b10083876c Merge topic 'feature-absence-hard-error'
8d0b1cca Features: FATAL_ERROR on compilers with no recorded features.
447fbb3f Tests: Execute compile features tests unconditionally.
597bb72e Tests: Run RunCMake.target_compile_features unconditionally.
2014-04-21 09:35:42 -04:00