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

24123 Commits

Author SHA1 Message Date
Stephen Kelly f1fd3714a4 cmMakefile: Report type of INTERFACE library in conflict. 2014-03-20 22:09:32 +01:00
Bruno Nova 2abd8efecb UseJava: Copy resource files before compiling the jar (#13360) 
Co-Author: Mary Ellen Foster <mefoster@gmail.com>
 2014-03-20 09:50:47 -04:00
Brad King ed6ddb89bf Merge branch 'upstream-kwsys' into update-kwsys 2014-03-20 09:42:27 -04:00
KWSys Robot 12faf00d71 KWSys 2014-03-19 (a8aa1014) 
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ a8aa1014 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' dd873734..a8aa1014
Gerhard Grimm (1):
      fa86f1ba SystemInformation: Fix HP-UX PA-RISC processor detection

Rolf Eike Beer (1):
      a8aa1014 SystemInformation: Fix HP-UX Intel processor detection

Change-Id: I5891a6898cc73caf1b2be98859d5d4b11a24c5df
 2014-03-20 09:42:18 -04:00
Tim Blechmann 95cdf13248 Treat .m files consistently as C across all generators 
Objective C sources should be compiled with the C compiler, not C++.

The Xcode generator correctly classifies ".m" sources already.  The
cmSystemTools::GetFileFormat method was fixed by commit v2.8.0~1782 (fix
for 7045, use gcc for .m, 2008-08-19) but it is not used by any of the
generator since commit v2.4.0~2819 (major changes to support addition of
languages, 2004-09-22).

Fix the CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS table entries so that
cmGlobalGenerator::GetLanguageFromExtension tells the Makefile, Ninja,
and VS IDE generators to compile ".m" sources as C.  This makes behavior
consistent on all generators.

Signed-off-by: Tim Blechmann <tim@klingt.org>
 2014-03-20 09:40:41 -04:00
Brad King a48de7d850 CMake 3.0.0-rc3 2014-03-20 09:26:39 -04:00
Brad King 0f79dab48b Merge branch 'release' 2014-03-20 09:24:44 -04:00
Brad King d8fb08a391 Merge topic 'watcom-updates' 
64c2342a Watcom: Enable 'WMake Makefiles' generator on Linux
5d9aa66c Watcom: Introduce OpenWatcom compiler id and fix compiler version
9292d3b8 Watcom: Detect compiler target architecture and platform
fbc883c9 Watcom: Add one blank line to Makefile for better readability
 2014-03-20 09:22:30 -04:00
Brad King 565213c1fd Merge topic 'configure_file-unicode' 
98383f80 Unicode: check encoding of files given to configure_file.
 2014-03-20 09:22:28 -04:00
Brad King df136e6c27 Merge topic 'ExternalProject-no-download-progress' 
f1b953ec Help: Add notes for topic 'ExternalProject-no-download-progress'
7d35b550 ExternalProject: Add option to disable download progress (#14807)
 2014-03-20 09:22:26 -04:00
Brad King b048a3edd0 Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH_2' 
cc5a0d8f FindPkgConfig: More unit tests
453d2b24 FindPkgConfig: small refactoring
 2014-03-20 09:22:25 -04:00
Brad King 82c590b12e Merge topic 'CheckTypeSize_#14056' 
7f857775 CheckTypeSize: Add unit test to cover the no-C case
7d6d45f2 CheckTypeSize: Support for CXX when C language is not enabled
 2014-03-20 09:22:23 -04:00
Brad King c79d98b457 Merge topic 'file-DOWNLOAD-cap-progress' 
413282c0 file: Avoid runaway DOWNLOAD/UPLOAD progress reports (#14807)
 2014-03-20 09:22:21 -04:00
Brad King 9c609db988 Merge topic 'minor_cleanups' 
19012b46 cmMakefile: Fix style.
10e6f1e7 cmMakefile: Fix typo in comment.
c3a2f78b Makefiles: Remove duplicate code.
2e0611f9 cmGeneratorExpression: Remove unused include.
d83ef53a Rename local 'dir_max' variables to 'dir'
 2014-03-20 09:22:20 -04:00
Brad King aa8f8777a4 Merge topic 'fix-AllFindModules-test-module-path' 
cf3e87e1 Tests: Teach CMakeOnly.AllFindModules to tolerate a system KDE4
 2014-03-20 09:22:18 -04:00
Brad King e1c1f18e39 Merge topic 'add_custom_command-DEPENDS-genex' 
bbffccca add_custom_command: Evaluate generator expressions in DEPENDS
 2014-03-20 09:22:17 -04:00
Brad King deb981c052 Merge topic 'Android-platform' 
77f06b14 Modules: Add an Andriod platform file
 2014-03-20 09:22:15 -04:00
Brad King fb60cf46b6 Merge topic 'fix-out-of-date-CTestTestMemcheck' 
84a42304 Tests: Prevent unnecessary rebuilds in CTestTestMemcheck
 2014-03-20 09:22:14 -04:00
Brad King 86b003c3c6 Merge topic 'add_custom_command-no-INTERFACE-lib' 
2600e923 Disallow INTERFACE libraries with add_custom_command(TARGET).
 2014-03-20 09:22:12 -04:00
Brad King 7bf8a549f9 Merge topic 'fix-Qt5-non-Windows' 
5f210672 QtDialog: Fix Qt 5 build on non-Windows.
 2014-03-20 09:22:10 -04:00
Stephen Kelly bbffccca42 add_custom_command: Evaluate generator expressions in DEPENDS 
Rely on evaluation in cmCustomCommandGenerator for the generators.

When tracing target dependencies, depend on the union of dependencies
for all configurations.
 2014-03-20 09:21:56 -04:00
Stephen Kelly 77f06b145d Modules: Add an Andriod platform file 
It is much like Linux but has no SONAME or RPATH.
 2014-03-20 09:04:31 -04:00
David Cole 84a4230406 Tests: Prevent unnecessary rebuilds in CTestTestMemcheck 
Repeated "cmake . && ninja" calls were resulting in rebuilds every time.

Change the test so that it uses "file(WRITE" to generate a ".in" file and
then configure_file to "copy if different" that ".in" file to the final
generated source file.

Now, rebuilds will only occur if there are changes to the generated source
file on "cmake ." runs after the first one.
 2014-03-20 09:02:50 -04:00
Julien Schueller d976064771 Revert "UseSWIG: Name extra generated files after module name (#10080)" 
This reverts commit f0111deb1e.
 2014-03-20 08:57:34 -04:00
Kitware Robot f039a3a78e CMake Nightly Date Stamp 2014-03-20 00:01:05 -04:00
Brad King cf3e87e195 Tests: Teach CMakeOnly.AllFindModules to tolerate a system KDE4 
The FindKDE4 module (incorrectly) modifies CMAKE_MODULE_PATH on the
caller's behalf.  This causes KDE4-installed find modules to be used by
the test instead of those in CMake.  Teach the test to restore the
CMAKE_MODULE_PATH to its original value after each find_package call.
This ensures that the next find_package actually tests our module.
 2014-03-19 13:33:00 -04:00
Brad King 6a85d624a8 Merge branch 'add_custom_command-no-INTERFACE-lib' into release 2014-03-19 10:57:04 -04:00
Brad King aee06336b8 Merge branch 'fix-Qt5-non-Windows' into release 2014-03-19 10:54:18 -04:00
Stephen Kelly 2600e923a6 Disallow INTERFACE libraries with add_custom_command(TARGET). 
Don't attempt to trace their dependencies.
 2014-03-19 15:51:21 +01:00
Stephen Kelly 5f210672da QtDialog: Fix Qt 5 build on non-Windows. 
The Qt5Core_QTMAIN_LIBRARIES variable is defined to the Qt5::WinMain
target on Windows, and undefined elsewhere.
 2014-03-19 15:38:02 +01:00
Kitware Robot 8b8691adca CMake Nightly Date Stamp 2014-03-19 00:01:09 -04:00
Brad King c5e4935828 Merge branch 'release' 2014-03-18 15:56:50 -04:00
Kitware Robot 2c5e78fa5d CMake Nightly Date Stamp 2014-03-18 00:01:09 -04:00
Clinton Stimpson 98383f802a Unicode: check encoding of files given to configure_file. 
UTF-16 and UTF-32 files are rejected.
 2014-03-17 14:01:55 -06:00
Jiri Malak 64c2342a8d Watcom: Enable 'WMake Makefiles' generator on Linux 2014-03-17 15:04:05 -04:00
Jiri Malak 5d9aa66c91 Watcom: Introduce OpenWatcom compiler id and fix compiler version 
Distinguish "Open Watcom" from old "Watcom" by introducing a new
"OpenWatcom" compiler id.  The __WATCOMC__ format is "VVRP" for Watcom
and "VVRP + 1100" for Open Watcom.
 2014-03-17 15:00:59 -04:00
Jiri Malak 9292d3b8a0 Watcom: Detect compiler target architecture and platform 
In CMakePlatformId.h.in, fill ARCHITECTURE_ID and PLATFORM_ID for Open
Watcom.
 2014-03-17 14:54:43 -04:00
Brad King 0f4e8fd0e9 CMake 3.0.0-rc2 2014-03-17 13:14:27 -04:00
Brad King f1b953ec9b Help: Add notes for topic 'ExternalProject-no-download-progress' 2014-03-17 13:12:10 -04:00
Daniele E. Domenichelli cc5a0d8f42 FindPkgConfig: More unit tests 2014-03-17 18:10:59 +01:00
Daniele E. Domenichelli 453d2b2438 FindPkgConfig: small refactoring 2014-03-17 17:50:35 +01:00
Daniele E. Domenichelli 7f857775e2 CheckTypeSize: Add unit test to cover the no-C case 2014-03-17 17:36:14 +01:00
Brad King 7d35b55060 ExternalProject: Add option to disable download progress (#14807) 
Add a DOWNLOAD_NO_PROGRESS option to disable progress reports while
downloading source tarballs.
 2014-03-17 11:28:05 -04:00
Brad King 413282c0cf file: Avoid runaway DOWNLOAD/UPLOAD progress reports (#14807) 
Curl makes progress callbacks frequently but we round to the nearest
percent and report only when that changes so that we make at most 101
progress reports.  However, when unexpected data beyond the total are
transferred the progress can get beyond 100% and lead to unlimited
reports.  Avoid this case by capping the reported progress to 100%.
 2014-03-17 11:05:34 -04:00
Stephen Kelly 19012b4652 cmMakefile: Fix style. 
Use this-> for member access.
 2014-03-17 15:34:53 +01:00
Stephen Kelly 10e6f1e716 cmMakefile: Fix typo in comment. 2014-03-17 15:33:54 +01:00
Stephen Kelly c3a2f78b5a Makefiles: Remove duplicate code. 
The cmGlobalUnixMakefileGenerator3::ProgressMapCompare struct is
logically equivalent to cmStrictTargetComparison.
 2014-03-17 15:32:19 +01:00
Stephen Kelly 2e0611f981 cmGeneratorExpression: Remove unused include. 2014-03-17 15:29:49 +01:00
Stephen Kelly d83ef53a12 Rename local 'dir_max' variables to 'dir' 
The code is not computing the maximum length directory, as is the
case in cmLocalVisualStudioGenerator::ComputeLongestObjectDirectory.
 2014-03-17 15:27:01 +01:00
Jiri Malak fbc883c942 Watcom: Add one blank line to Makefile for better readability 2014-03-17 10:23:52 -04:00