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

23806 Commits

Author SHA1 Message Date
Brad King 9a5c554414 cmGlobalXCodeGenerator: Simplify handling of multiple outputs 
Make the multiple output pair map more local.  Generate it where we
have the current configuration available.
 2014-03-12 10:44:00 -04:00
Brad King d45e7f3461 cmCustomCommand: Return std::string from GetWorkingDirectory 2014-03-12 10:44:00 -04:00
Brad King cb8f87f622 Merge topic 'remove-c_str-calls' 
3be265b3 Workaround Sun C++ 5.9 compiler crash
af8a1643 Remove c_str calls when using stream APIs.
21c573f6 Remove some c_str() calls.
 2014-03-12 10:42:38 -04:00
Brad King 3be265b304 Workaround Sun C++ 5.9 compiler crash 
Adjust whitespace in Source/CPack/cpack.cxx to avoid a strange
internal compiler crash.
 2014-03-12 10:40:45 -04:00
Brad King 9defc45f78 Merge branch 'release' 2014-03-12 10:18:52 -04:00
Brad King 85ffb02919 Merge topic 'unicode-cmake-gui' 
649789a7 Unicode: cmake-gui encoding now matches KWSys encoding.
 2014-03-12 10:13:18 -04:00
Brad King 7122f6b1a8 Merge topic 'FindPkgConfig-revise-docs' 
49ef91d7 FindPkgConfig: restructure documentation and document commands and variables
 2014-03-12 10:13:17 -04:00
Brad King 4d2545f41c Merge topic 'fix-find_dependency-EXACT-for-master' 
f74a8405 Test error cases in find_dependency.
 2014-03-12 10:13:15 -04:00
Brad King 5082e31ba3 Merge topic 'fix-find_dependency-EXACT' 
224f50f4 find_dependency: Make sure invalid EXACT use can be reported.
 2014-03-12 10:13:13 -04:00
Brad King 2c6970a3ca Merge topic 'fix-xcode-compiler-force' 
8c9bfac3 Xcode: Convert forced CMAKE_<LANG>_COMPILER to full path if possible
6852fb80 CMakeDetermine*Compiler: Factor out search for compiler in PATH
 2014-03-12 10:13:12 -04:00
Brad King 7534967b65 Merge branch 'fix-find_dependency-EXACT' into release 2014-03-12 10:12:06 -04:00
Brad King ae32622bcf cmake-gui: Fix handling of missing CMAKE_EXTRA_GENERATOR (#14804) 
Since commit 1a1b737c (stringapi: Use strings for generator names,
2014-02-24) cmExternalMakefileProjectGenerator::CreateFullGeneratorName
expects a std::string instead of const char*.  When no extra generator
name is available, pass an empty string to avoid NULL dereference.
 2014-03-12 09:55:23 -04:00
Kitware Robot c4c6427ed6 CMake Nightly Date Stamp 2014-03-12 00:01:12 -04:00
Stephen Kelly af8a1643c1 Remove c_str calls when using stream APIs. 
Use an ad-hoc clang tool for matching the calls which should be
ported.
 2014-03-11 15:03:50 +01:00
Stephen Kelly 21c573f682 Remove some c_str() calls. 
Use the clang RemoveCStrCalls tool to automatically migrate the
code. This was only run on linux, so does not have any positive or
negative effect on other platforms.
 2014-03-11 15:03:50 +01:00
Stephen Kelly 224f50f42f find_dependency: Make sure invalid EXACT use can be reported. 
Test the first argument directly for matching 'EXACT'. The error
check in its previous position was incorrect and would only trigger
with a version of '0' or similar.
 2014-03-11 14:51:06 +01:00
Stephen Kelly f74a8405b6 Test error cases in find_dependency. 2014-03-11 14:48:35 +01:00
Brad King b801205dad Merge topic 'ctest-coverage-extra' 
93d5c4dc Help: Add release notes for topic 'ctest-coverage-extra'
ef1c1153 CTest: Teach ctest_coverage() to read CTEST_COVERAGE_EXTRA_FLAGS
 2014-03-11 09:18:28 -04:00
Brad King ea6b47d2d5 Merge branch 'release' 2014-03-11 09:16:42 -04:00
Brad King a86617902d Merge topic 'cmcurl-include-first' 
e8c027bc cmcurl: Include the local curl directories before all others.
 2014-03-11 09:14:08 -04:00
Brad King 1b809c09ff Merge topic 'watcom-VERBOSE-and-ERROR' 
f1b689b6 Makefile: Improve handling of WMake verbose output and errors
 2014-03-11 09:14:07 -04:00
Brad King 8559c326c4 Merge topic 'cmELF-typo' 
172d8d94 cmELF: Fix typo in comment, 32-bit => 64-bit (#14799)
 2014-03-11 09:14:05 -04:00
Brad King 312a6b7bde Merge topic 'ninja-command-line-length-haiku' 
6c90f0a6 Ninja: Detect command-line length limit on Haiku
 2014-03-11 09:14:03 -04:00
Brad King 70c6eda8c2 Merge topic 'FindFreetype-path-suffix-without-include' 
b79a1f67 FindFreetype: Add plain 'freetype2' path suffix
 2014-03-11 09:14:01 -04:00
Brad King 3d3adc0c57 Merge topic 'FindSDL-consistent-path-suffixes' 
d71db3a0 FindSDL: Make FindSDL_*.cmake path suffixes consistent with main module
 2014-03-11 09:14:00 -04:00
Brad King 510ceb19ed Merge topic 'fix-AUTOGEN-custom-command-depends' 
112cba92 QtAutogen: Fix AUTOGEN depends on custom command output with VS.
 2014-03-11 09:13:58 -04:00
Brad King c9241cad83 Merge topic 'fix-find_dependency-EXACT-for-master' 
45abfb0c find_dependency: Extend the tests for use of EXACT macro parameter.
 2014-03-11 09:13:56 -04:00
Brad King dfcacecd18 Merge topic 'fix-find_dependency-EXACT' 
08ba128f find_dependency: Don't propagate EXACT argument.
 2014-03-11 09:13:54 -04:00
Brad King a2d63a9d04 Merge topic 'fix-Qt4-DBus-macro' 
fc2bad57 Qt4: Use correct qdbus executable in macro.
 2014-03-11 09:13:53 -04:00
Brad King c2d1ea3181 Merge branch 'fix-xcode-compiler-force' into release 2014-03-11 09:06:53 -04:00
Kitware Robot 64b93354dc CMake Nightly Date Stamp 2014-03-11 00:01:07 -04:00
Clinton Stimpson 649789a736 Unicode: cmake-gui encoding now matches KWSys encoding. 
A UTF-8 QTextCodec is used with QString when KWSys is
configured to treat strings as UTF-8.
This means QString::toLocal8Bit() will convert to UTF-8.
 2014-03-10 21:08:43 -06:00
Brad King 8c9bfac384 Xcode: Convert forced CMAKE_<LANG>_COMPILER to full path if possible 
During cross-compiling the toolchain file may use CMakeForceCompiler to
force a compiler setting.  When using the Xcode generator try to convert
it to a full path by searching the PATH as is done for the Makefile
generators.
 2014-03-10 17:12:00 -04:00
Brad King 6852fb8034 CMakeDetermine*Compiler: Factor out search for compiler in PATH 
Factor out a _cmake_find_compiler_path helper macro to avoid duplication
of the search for a full path to the compiler.
 2014-03-10 17:12:00 -04:00
Daniele E. Domenichelli 49ef91d7a6 FindPkgConfig: restructure documentation and document commands and variables 2014-03-10 18:27:46 +01:00
Raphael Kubo da Costa e8c027bcc0 cmcurl: Include the local curl directories before all others. 
In some cases, it was possible for the include directory of the system-wide
libcurl to be added to the include path before cmcurl's, which would result
in them being picked up and causing the build to fail if the curl versions
differ too much.

One way to trigger this is to have OpenSSL installed into a non-default
location together with libcurl (/usr/local, for example). If cmcurl is built
with CMAKE_USE_OPENSSL on, -I/usr/local/include would end up being added
before -I${PATH_TO_CMCURL}.
 2014-03-10 11:40:12 -04:00
Jiri Malak f1b689b64a Makefile: Improve handling of WMake verbose output and errors 
* The '-e' option has nothing to do with verbose output.
  It is now properly handled by .ERASE directive in make file

* The '-s' option sets silent output globally, it cannot be switched off.
  It is now handled only by .SILENT directive in make file directive
  is simply controlled by a conditonal block.

Remove SilentNoColon member variable as it is no longer needed.
 2014-03-10 11:15:12 -04:00
Ryo ONODERA 172d8d94f4 cmELF: Fix typo in comment, 32-bit => 64-bit (#14799) 2014-03-10 11:05:26 -04:00
Brad King e21ffaf8fe Merge topic 'doc-osx-path-variables' 
764e977a Help: Document variables CMAKE_APPBUNDLE_PATH and CMAKE_FRAMEWORK_PATH
 2014-03-10 10:35:32 -04:00
Brad King 29d4f6b03b Merge branch 'doc-osx-path-variables' into release 2014-03-10 10:24:16 -04:00
Brad King 764e977ad7 Help: Document variables CMAKE_APPBUNDLE_PATH and CMAKE_FRAMEWORK_PATH 2014-03-10 10:23:42 -04:00
Brad King 93d5c4dc22 Help: Add release notes for topic 'ctest-coverage-extra' 2014-03-10 10:21:11 -04:00
Volkan Gezer ef1c1153d3 CTest: Teach ctest_coverage() to read CTEST_COVERAGE_EXTRA_FLAGS 
Use it to set the CoverageExtraFlags value just as COVERAGE_EXTRA_FLAGS
does in the CTest module for creating DartConfiguration.tcl.
 2014-03-10 09:54:27 -04:00
Adrien Destugues 6c90f0a693 Ninja: Detect command-line length limit on Haiku 2014-03-10 09:42:38 -04:00
Adrien Destugues b79a1f6719 FindFreetype: Add plain 'freetype2' path suffix 
On Haiku, the headers are not in an 'include' directory.
 2014-03-10 09:42:05 -04:00
Brad King d71db3a0d8 FindSDL: Make FindSDL_*.cmake path suffixes consistent with main module 
Add the 'SDL' path suffix to the FindSDL_*.cmake modules.  Add a comment
explaining the purpose of suffixes as in commit v3.0.0-rc1~540^2
(FindSDL: Add path suffixes for <prefix>/include/..., 2013-10-08).

Inspired-by: Adrien Destugues <pulkomandy@pulkomandy.tk>
 2014-03-10 09:40:34 -04:00
Brad King ebaa5a6410 Merge branch 'fix-AUTOGEN-custom-command-depends' into release 2014-03-10 09:38:52 -04:00
Brad King 29ff93a970 Merge branch 'fix-find_dependency-EXACT' into release 2014-03-10 09:38:48 -04:00
Brad King ef0386c250 Merge branch 'fix-Qt4-DBus-macro' into release 2014-03-10 09:38:38 -04:00
Brad King 581abf6d31 Merge branch 'release' 2014-03-10 09:37:08 -04:00