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

23786 Commits

Author SHA1 Message Date
Brad King a5a6d53782 Merge topic 'cmake-gui-symlinks' 
480be00b cmake-gui: Don't resolve symlinks with using file dialog.
 2014-04-01 11:06:14 -04:00
Brad King ce9ffd6b23 Merge topic 'find_package-check-quiet' 
83934757 Find*: Make find_package(.. QUIET) affect Check* modules.
4c0cc9ab Check*.cmake : Add CMAKE_REQUIRED_QUIET flag.
 2014-04-01 11:06:12 -04:00
Brad King 8617de566f Merge topic 'hpux-processorcount' 
c3e238dd ProcessorCount: use mpsched on HPUX if machinfo is not present
 2014-04-01 11:06:11 -04:00
Brad King 05d3570cf5 Merge topic 'ExternalProject_GitUpdate' 
f2128d4c ExternalProject: Improve handling of git remote branches
ff2451dc ExternalProject: Strip trailing space from git hash
 2014-04-01 11:06:09 -04:00
Brad King 382c9ee859 Merge topic 'link-line-quoting' 
423009c1 Makefile: Generate single-quoted object lists for Watcom
a863a8fe cmLocalUnixMakefileGenerator3: Re-organize ConvertToQuotedOutputPath
 2014-04-01 11:06:08 -04:00
Brad King 09498984b1 Merge topic 'UseSWIG-NO_SONAME' 
f26147b8 UseSWIG: Enable NO_SONAME on swig modules (#14815)
 2014-04-01 11:06:06 -04:00
Daniele E. Domenichelli f2128d4c28 ExternalProject: Improve handling of git remote branches 
ExternalProject handles git remote branches by commit hash. Due to
this, the git repository ends in detached states, and local commits
are discarded.

Use "git rebase" for remote branches instead of "git checkout".  If
there are uncommitted changes, use "git stash save/pop" to save changes
and restore them after the rebase.  If any of these operations fails,
try to restore the original status and exit with a fatal error, asking
the user to resolve the conflicts manually.

This also makes the behaviour of ExternalProject using git more similar
to the svn version, and probably more likely to what the user expects
by setting GIT_TAG to a branch.
 2014-04-01 10:51:58 -04:00
Daniele E. Domenichelli ff2451dc24 ExternalProject: Strip trailing space from git hash 2014-04-01 10:51:53 -04:00
Julien Schueller f26147b871 UseSWIG: Enable NO_SONAME on swig modules (#14815) 
Swig modules are plugins and do not need the SONAME field set.
 2014-04-01 10:48:13 -04:00
Kitware Robot e3e1ba3f78 CMake Nightly Date Stamp 2014-04-01 00:01:05 -04:00
Kitware Robot 521b930bf4 CMake Nightly Date Stamp 2014-03-31 00:01:05 -04:00
Clinton Stimpson 480be00bfa cmake-gui: Don't resolve symlinks with using file dialog. 
This fixes bug #14274 where a clang++ symlink was resolved to
a clang executable.
 2014-03-29 22:41:44 -06:00
Kitware Robot 9298987a82 CMake Nightly Date Stamp 2014-03-30 00:01:06 -04:00
Clinton Stimpson 83934757c9 Find*: Make find_package(.. QUIET) affect Check* modules. 
Fixes issues #14812 and #14813 where find_package(OpenMP QUIET) and
find_package(Qt4 QUIET) would still print out messages when calling
check*() functions.

Also a partial fix for  #14445 where building CMake
(without cmake-gui) when Qt5 is installed and Qt4 is not installed
and warnings come out of FindQt4.cmake.
 2014-03-29 20:22:54 -06:00
Clinton Stimpson 4c0cc9ab91 Check*.cmake : Add CMAKE_REQUIRED_QUIET flag. 
Setting this flag can silence messages from the Check*.cmake modules.
This can be used by Find*.cmake modules when they are in silent mode.
 2014-03-29 20:14:23 -06:00
Kitware Robot 5bad8ae342 CMake Nightly Date Stamp 2014-03-29 00:01:05 -04:00
Rolf Eike Beer c3e238dd53 ProcessorCount: use mpsched on HPUX if machinfo is not present 
Co-Author: Gerhard Grimm <gerhard.grimm@detec.com>
 2014-03-28 18:02:49 +01:00
Kitware Robot cab2e31443 CMake Nightly Date Stamp 2014-03-28 00:01:05 -04:00
Jiri Malak 423009c17f Makefile: Generate single-quoted object lists for Watcom 
Drop the CMAKE_NO_QUOTED_OBJECTS internal variable from the Makefile
generators.  The underlying problem is with the Watcom linker, not with
WMake.  The Watcom linker wants object files to be single-quoted.  Add
<LINK-RULE>_USE_WATCOM_QUOTE platform information variables to tell the
generators to use Watcom-style single quotes for object files on link
lines.

On Windows, Watcom uses the GetCommandLine API to get the original
command-line string and do custom parsing that expects single quotes.
On POSIX systems, Watcom approximates the original command line by
joining all argv[] entries separated by a single space.  Therefore we
need to double-quote the single-quoted arguments so that the shell does
not consume them and they are available for the parser to see.
 2014-03-27 13:45:29 -04:00
Jiri Malak a863a8fecd cmLocalUnixMakefileGenerator3: Re-organize ConvertToQuotedOutputPath 
Use one code path whether the components list is empty or not.
Fix indentation accordingly.
 2014-03-27 13:45:27 -04:00
Brad King ede0419a37 Merge topic 'osx-CFBundle-info-plist' 
90e22f8f OS X: Fix Info.plist placement in a CFBundle
 2014-03-27 11:12:10 -04:00
Brad King e8451d6426 Merge topic 'threads-cleanup' 
693f8bf3 FindThreads: simplify checking for SunOS
858ce31f FindThreads: avoid useless checks if a thread library is already found
fdf7bd27 FindThreads: replace MATCHES with STREQUAL
 2014-03-27 11:12:08 -04:00
Brad King 0301e36fcd Merge topic 'suppress-diagnostic-context-note-warnings' 
53674755 CTestCustom: Suppress "note: in expansion of macro" diagnostic context
 2014-03-27 11:12:07 -04:00
Brad King c53e82093f Merge topic 'fix-CTestTestMemcheck-xcode2-missing-dirs' 
27b81213 Tests/CTestTestMemcheck: Help Xcode 2.x create output dirs
 2014-03-27 11:12:05 -04:00
Kitware Robot e03ac807cf CMake Nightly Date Stamp 2014-03-27 00:01:18 -04:00
Brad King 27b812132c Tests/CTestTestMemcheck: Help Xcode 2.x create output dirs 
Add the PRE_BUILD step to all targets that need it so the output
directories get created no matter which target is built first.
 2014-03-26 15:09:56 -04:00
Brad King 536747552f CTestCustom: Suppress "note: in expansion of macro" diagnostic context 
Such notes only appear with other diagnostics and should not be
considered a warning on their own.
 2014-03-26 14:00:16 -04:00
Brad King 63c6325487 Merge topic 'fix-Qt-manual-typo' 
dcfbbe87 Help: Fix typo in cmake-qt manual.
 2014-03-26 13:24:47 -04:00
Brad King 6ae3fbfeda Merge topic 'dev/find-boost-graph_parallel' 
f284b003 FindBoost: Search next to MPI libs for graph_parallel (#14832)
 2014-03-26 13:24:45 -04:00
Brad King edb506b862 Merge topic 'fix-Qt-Autogen' 
71a11252 QtAutogen: Fix use of multiple ui files in a single target.
261acd91 QtAutogen: Use the basename for resource files.
 2014-03-26 13:24:43 -04:00
Brad King 098a39f21c Merge topic 'simplify-empty-LDFLAGS' 
1b18f442 Avoid trailing space in CMAKE_*_LINKER_FLAGS when LDFLAGS is empty
 2014-03-26 13:24:42 -04:00
Brad King 2cb8417584 Merge topic 'FindPkgConfig-stop-on-missing' 
63a4c0af FindPkgConfig: Stop processing when REQUIRED package not found (#14381)
 2014-03-26 13:24:40 -04:00
Brad King a11d1c6135 Merge topic 'dev/custom-ninja-deptypes' 
9523d2a5 ninja: Add support for custom depfile formats
 2014-03-26 13:24:39 -04:00
Brad King f04e217cc1 Merge topic 'remove-CMakeFiles-advice' 
bccc056b cmake: Advise user to remove CMakeFiles with CMakeCache.txt (#14820)
 2014-03-26 13:24:37 -04:00
Brad King 06c9f55449 Merge topic 'haiku-updates' 
0cc42b87 Haiku: Fix compiler detection when using distcc
84603d80 Haiku: Enable CMake builtin ELF editor
 2014-03-26 13:24:36 -04:00
Brad King ab07d383a9 Merge topic 'fix-Qt4-moc-commands-depends' 
734df96f Qt4: Fix moc command dependencies for incremental build.
 2014-03-26 13:24:34 -04:00
Brad King 9b536b914b Merge topic 'report-INTERFACE-type-in-conflict' 
f1fd3714 cmMakefile: Report type of INTERFACE library in conflict.
 2014-03-26 13:24:33 -04:00
Brad King bcd4d0ced8 Merge topic 'UseJava-fix-resource-copy' 
2abd8efe UseJava: Copy resource files before compiling the jar (#13360)
 2014-03-26 13:24:31 -04:00
Brad King 5ae8f33617 Merge topic 'update-kwsys' 
ed6ddb89 Merge branch 'upstream-kwsys' into update-kwsys
12faf00d KWSys 2014-03-19 (a8aa1014)
 2014-03-26 13:24:30 -04:00
Brad King 046c1a1f65 Merge topic 'compile-m-as-c' 
95cdf132 Treat .m files consistently as C across all generators
 2014-03-26 13:24:28 -04:00
Brad King 74a45ce647 Merge topic 'UseSWIG-revert-bad-fix-0010080' 
d9760647 Revert "UseSWIG: Name extra generated files after module name (#10080)"
 2014-03-26 13:24:26 -04:00
Brad King 7e92f047be Merge branch 'release' 2014-03-26 13:07:26 -04:00
Stephen Kelly dcfbbe87eb Help: Fix typo in cmake-qt manual. 
Do -> To.
 2014-03-26 17:50:08 +01:00
Tim Blechmann 90e22f8f71 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-03-26 10:52:23 -04:00
Kitware Robot a29ea834de CMake Nightly Date Stamp 2014-03-26 00:01:05 -04:00
Rolf Eike Beer 693f8bf34d FindThreads: simplify checking for SunOS 2014-03-25 23:49:54 +01:00
Rolf Eike Beer 858ce31f4c FindThreads: avoid useless checks if a thread library is already found 2014-03-25 23:47:49 +01:00
Rolf Eike Beer fdf7bd27a3 FindThreads: replace MATCHES with STREQUAL 2014-03-25 22:46:11 +01:00
Ben Boeckel f284b003d7 FindBoost: Search next to MPI libs for graph_parallel (#14832) 
In addition to the MPI libraries, graph_parallel lives in the MPI libdir
as well.
 2014-03-25 16:26:11 -04:00
Kitware Robot a56a8f9536 CMake Nightly Date Stamp 2014-03-25 00:01:06 -04:00