Commit Graph

16982 Commits

Author SHA1 Message Date
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
Brad King ec941fc04b Merge topic 'ctest-memcheck-sanitizers'
e0e75a72 Help: Add notes for topic 'ctest-memcheck-sanitizers'
7345a1f7 tests: Add a test for ctest_memcheck MemorySanitizer
0c6330da ctest_memcheck: Add support for MemorySanitizer msan
9ba8bf12 tests: add a test for ctest_memcheck UndefinedBehaviorSanitizer
816c100a ctest_memcheck: Add support for UndefinedBehaviorSanitizer ubsan
b67ef537 ctest_memcheck: Order sanitizer type code consistently
f48a2968 Tests: Organize CTestTestMemcheck inner test code
2014-10-08 10:48:12 -04:00
Brad King de8e534b41 Ninja: Limit custom command side-effects to build folder
Revert commit 7243c951 (Ninja: Don't limit custom cmd side-effects to
build folder, 2014-06-27) because it causes every custom command
dependency in the source tree to get a phony rule.  For large projects
these rules get too big for Ninja to handle efficiently.  While the
original change addressed a valid concern, it did not seem to occur
regularly in practice because well-behaved projects generate their
side-effects only in the build tree.  Until we support explicit
specification of side-effects (CMake issue #14963), we will have to use
this as a middle-ground.
2014-10-08 08:50:15 -04:00
Kitware Robot 734580a8db CMake Nightly Date Stamp 2014-10-08 00:01:08 -04:00
Bill Hoffman 0c6330da38 ctest_memcheck: Add support for MemorySanitizer msan 2014-10-07 15:27:34 -04:00
Ben Boeckel 816c100ae2 ctest_memcheck: Add support for UndefinedBehaviorSanitizer ubsan
UBSan instruments a build and logs messages on any undefined behavior
instances.
2014-10-07 15:27:34 -04:00
Brad King b67ef537d4 ctest_memcheck: Order sanitizer type code consistently
Use alphabetic order everywhere we enumerate the sanitizer types.
2014-10-07 15:27:33 -04:00
Brad King fa56eb56b9 Merge topic 'ctest-memcheck-sanitizers'
f25e431d tests: set sanitizer options properly
f0661bf3 tests: fix copy/paste from tsan -> asan comments
ca9cc25c ctest: add support for additional sanitizer options
0b9ffffc ctest: update documentation for CTEST_MEMORYCHECK_TYPE
2014-10-07 14:45:26 -04:00
Brad King 36c7f66206 Merge topic 'fix-ninja-rsp-var-duplication'
71da30ca Ninja: Fix variable duplication in RSP rules
2014-10-07 14:12:20 -04:00
Brad King 1ed0379f79 Merge topic 'cpack-ifw-updates'
ed9684a2 CPackIFW: Added support for multiple repositories
f9f74874 CPackIFW: Search algorithm update
2014-10-07 14:12:16 -04:00
Brad King a7a80da0a0 Merge topic 'encoding-fstream'
42e39bb3 Fix a few more places to use cmsys::[io]fstream instead of std::fstream.
2014-10-07 14:12:14 -04:00
Kitware Robot b8f194732f CMake Nightly Date Stamp 2014-10-07 00:01:08 -04:00
Nils Gladitz 71da30cae0 Ninja: Fix variable duplication in RSP rules
Stream clear() resets stream state but does not actually clear its content.
2014-10-06 22:29:09 +02:00
Brad King 3f91919322 Merge topic 'fix-cobertura-parsing'
1c838add cmParseCoberturaCoverage: Initialize CurFileName to empty string
2014-10-06 09:41:23 -04:00
Brad King c74d2ddfa4 Merge topic 'wix-fix-root-dir-prop'
fb009f00 CPackWiX: Work around RelativePath() returning an empty string for the root
2014-10-06 09:41:21 -04:00
Brad King b1531431dd Merge topic 'ninja-console-pool'
9f32a241 Ninja: Use 'console' pool for CMake re-run if possible (#14915)
2014-10-06 09:41:18 -04:00
Kitware Robot f17989b32d CMake Nightly Date Stamp 2014-10-06 00:01:07 -04:00
Konstantin Podsvirov ed9684a22c CPackIFW: Added support for multiple repositories
Now user can add IFW specific repo with cpack_ifw_add_repository macro
2014-10-05 12:52:57 +04:00
Kitware Robot 594cdd4d28 CMake Nightly Date Stamp 2014-10-05 00:01:08 -04:00
Clinton Stimpson 42e39bb37d Fix a few more places to use cmsys::[io]fstream instead of std::fstream. 2014-10-04 14:20:04 -06:00
Konstantin Podsvirov f9f748745c CPackIFW: Search algorithm update
Variables like CPACK_IFW_*_EXECUTABLE_FOUND now not needed
2014-10-04 22:55:43 +04:00
Kitware Robot ab74ad5a5f CMake Nightly Date Stamp 2014-10-04 00:01:08 -04:00
Brad King d2562e2353 Merge topic 'vs-intel-15'
a128129a VS: Support Intel Fortran 15 .vfproj generation (#15175)
2014-10-03 15:10:10 -04:00
Jonathan Beezley 1c838addf5 cmParseCoberturaCoverage: Initialize CurFileName to empty string
When the file is not found in $CMAKE_SOURCE_DIR/<file path>,
the CurFileName pointer remained set to the previous file.  This
caused the new file's coverage data to populate the into the
wrong object giving incorrect results and occasionally resulting
in a seg fault.
2014-10-03 14:35:56 -04:00
Ben Boeckel ca9cc25ce8 ctest: add support for additional sanitizer options
Sanitizers receive options through their environment variable; support
user-specified options here.
2014-10-03 13:45:07 -04:00
Ben Boeckel 0b9ffffcd4 ctest: update documentation for CTEST_MEMORYCHECK_TYPE
The AddressSanitizer value was not documented.

Also fix some typos.
2014-10-03 13:43:44 -04:00
Nils Gladitz fb009f00ae CPackWiX: Work around RelativePath() returning an empty string for the root 2014-10-03 15:10:51 +02:00
Sylvain Joubert 9f32a2411b Ninja: Use 'console' pool for CMake re-run if possible (#14915)
The pre-defined 'console' pool is a non-buffered pool that runs with a
depth of 1.  CMake re-run cannot be run concurrently and it will
eventually output something.  A non-buffered pool allows to get it as
soon as possible

Also, generate the minimal required version of Ninja in the build file.
2014-10-03 08:48:47 -04:00
Kitware Robot 0e0cb710d0 CMake Nightly Date Stamp 2014-10-03 00:01:17 -04:00
Kitware Robot 99d34f46fa CMake Nightly Date Stamp 2014-10-02 00:01:07 -04:00
Kitware Robot 83e0ceb285 CMake Nightly Date Stamp 2014-10-01 00:01:10 -04:00
Brad King 34d035e70e Merge topic 'vs-nsight-tegra-generator'
df84281d Help: Add notes for topic 'vs-nsight-tegra-generator'
69e198dc VS: Generate Nsight Tegra project revision number
5365c9ac VS: Map Nsight Tegra file types in .vcxproj files
178f56a5 VS: Fix Tegra-Android platform linking of libraries by name
7115702f Tests: Add test for VS Nsight Tegra generator support
a6289499 VS: Generate ANDROID_GUI executables as app packages
c12e4699 Add 'ANDROID_API' target property to set Android Target API
9a4df52a Add 'ANDROID_GUI' target property to mark Android applications
16569abf cmTarget: Track internally whether platform is Android
ef0fd4f0 VS: Teach vcxproj generation about the Tegra-Android platform
d09b60f5 VS: Detect compiler id of Nsight Tegra-Android toolchains
2f071466 VS: Teach VS >= 10 to recognize CMAKE_SYSTEM_NAME 'Android'
2014-09-30 08:46:27 -04:00
Brad King 69e198dc3f VS: Generate Nsight Tegra project revision number
Nsight Tegra 2.0 will be revision '8'.  Generate this revision number
and add a NsightTegraUpgradeOnceWithoutPrompt element to tell newer
versions not to prompt when upgrading the generated project file.
2014-09-30 08:45:35 -04:00
Brad King 5365c9ac37 VS: Map Nsight Tegra file types in .vcxproj files
Map ".java" to JCompile, ".asm" and ".s" to ClCompile, and a few
Android-specific source file names to AndroidBuild.  This allows
Nsight Tegra 1.6 and above to check up-to-dateness of such sources.
Bump NsightTegraProjectRevisionNumber to 7 to allow these fields.
2014-09-30 08:45:35 -04:00
Brad King a62894998f VS: Generate ANDROID_GUI executables as app packages
When an executable is marked with ANDROID_GUI, generate an AntBuild
step in the .vcxproj file and point it at the directory found to
contain AndroidManifest.xml.  Assume it also contains build.xml.
2014-09-30 08:45:34 -04:00
Brad King c12e46991e Add 'ANDROID_API' target property to set Android Target API
Also add a 'CMAKE_ANDROID_API' variable to set the property default.
2014-09-30 08:45:34 -04:00
Brad King a128129a86 VS: Support Intel Fortran 15 .vfproj generation (#15175)
This version of the Intel Fortran plugin to Visual Studio says:

 please make sure that $(OutDir), $(TargetName) and $(TargetExt)
 property values match the value specified in %(Link.OutputFile)

We must set TargetName and TargetExt in addition to the existing
setting for OutputDirectory.  The settings do not appear to hurt
older versions of Intel Fortran, so set them unconditionally.

Extend the FortranOnly test to cover a corresponding use case by
using the OUTPUT_NAME target property.

Inspired-by: Ian Harvey <Ian.Harvey@megms.com.au>
2014-09-30 08:24:50 -04:00
Kitware Robot 026c4a5d1b CMake Nightly Date Stamp 2014-09-30 00:01:07 -04:00
Brad King cb9e86706c Merge topic 'vs-minor-cleanups'
c655f0c4 VS: Drop GenerateManifest from .vcxproj files for non-MS tools
227a3367 VS: Use case-insensitive check for hlsl,jpg,png,xml file extensions
4a24015a Tests: Always detect VS and SDK availability on Windows
2014-09-29 16:26:07 -04:00
Brad King 9a4df52aa1 Add 'ANDROID_GUI' target property to mark Android applications
Also add a 'CMAKE_ANDROID_GUI' variable to set the property default
so a project can easily make all executables Android applications.
An Android application executable file has the same extension as a
shared library (.so).
2014-09-29 16:05:53 -04:00
Brad King 16569abfa8 cmTarget: Track internally whether platform is Android
Add an IsAndroid member to save whether CMAKE_SYSTEM_NAME is "Android".
2014-09-29 16:05:53 -04:00
Brad King ef0fd4f0ce VS: Teach vcxproj generation about the Tegra-Android platform
Complete the basic implementation of the VS Tegra-Android generators
by replacing parts of vcxproj files that are specific to MS tools
with settings defined for the NVIDIA Nsight Tegra tools.

Current limitations include:

* We have no "flag table" so flags will be passed in the additional
  options fields instead of mapped to the vcxproj elements defined
  by Nsight Tegra msbuild platform definition files.

* We have no interface to set the AndroidArch, AndroidStlType, or
  AndroidTargetAPI fields so defaults will be used.

* The Nsight Tegra msbuild platform definition files do not provide
  a working "Utility" target type so for add_custom_target we need
  to use a "StaticLibrary" target type and leave out ClCompile rules.

* There is also no target type for plain command-line executables
  so for add_executable we need to use a "DynamicLibrary" target.
  Full application bundles will likely require new CMake target
  properties (like WIN32_EXECUTABLE for Windows GUI executables).
2014-09-29 16:05:53 -04:00
Brad King c655f0c417 VS: Drop GenerateManifest from .vcxproj files for non-MS tools
The .vcxproj file content generated by OutputLinkIncremental is
specific to MS tools, so drop it when using other tools.
2014-09-29 16:05:52 -04:00
Brad King 2f071466eb VS: Teach VS >= 10 to recognize CMAKE_SYSTEM_NAME 'Android'
When CMAKE_SYSTEM_NAME is 'Android', check for an installation of
'NVIDIA Nsight Tegra Visual Studio Edition' and generate .vcxproj
files for the "Tegra-Android" platform.  Also make the installed
version available in a CMAKE_VS_NsightTegra_VERSION variable.
2014-09-29 16:05:52 -04:00
Brad King 227a336714 VS: Use case-insensitive check for hlsl,jpg,png,xml file extensions
These "extra" sources should map to the proper tool even when they
are not in lower case.
2014-09-29 16:05:52 -04:00
Brad King a22570ea19 Merge topic 'wix-directory-permissions'
d48c781f CPackWiX: Extend CPACK_WIX_ACL to support directories
2014-09-29 09:21:45 -04:00
Brad King c38d9687ca Merge topic 'update-kwsys'
20853009 Merge branch 'upstream-kwsys' into update-kwsys
a79ff0e4 KWSys 2014-09-25 (29ffaf43)
2014-09-29 09:21:43 -04:00
Kitware Robot 693c20df76 CMake Nightly Date Stamp 2014-09-29 00:01:08 -04:00
Kitware Robot 7a8be6ea41 CMake Nightly Date Stamp 2014-09-28 00:01:07 -04:00
Nils Gladitz d48c781fc2 CPackWiX: Extend CPACK_WIX_ACL to support directories 2014-09-27 17:34:39 +02:00
Kitware Robot 58dc05de9e CMake Nightly Date Stamp 2014-09-27 00:01:07 -04:00
Brad King 208530090d Merge branch 'upstream-kwsys' into update-kwsys 2014-09-26 09:34:26 -04:00
Kitware Robot 4551a53c11 CMake Nightly Date Stamp 2014-09-26 00:01:08 -04:00
Kitware Robot 93da76d4d8 CMake Nightly Date Stamp 2014-09-25 00:01:08 -04:00
Brad King 17a457dcb0 Merge topic 'fix_search_path_ios_trycompile'
55a885da Teach try_compile COPY_FILE to look for IOS app bundles.
2014-09-24 09:21:50 -04:00
Brad King efd16ba928 Merge topic 'vs-wince-exe-entry-point'
e7aeb79f VS, WINCE: Only set EntryPointSymbol for executables
2014-09-24 09:21:48 -04:00
Brad King e6a7abd2b6 Merge topic 'fix-LOCATION-slashes'
92b2c618 Remove extra slashes from LOCATION target property value
2014-09-24 09:21:46 -04:00
Brad King be5215c4ba Merge topic 'ninja-compiler-change'
6120fca8 Ninja: Prevent compilers to be silently modified
2014-09-24 09:21:44 -04:00
Kitware Robot 6bd776eba6 CMake Nightly Date Stamp 2014-09-24 00:01:08 -04:00
Bill Hoffman 55a885da00 Teach try_compile COPY_FILE to look for IOS app bundles.
The COPY_FILE option on try_compile never looked for IOS application
bundles. This caused it to fail if the CMAKE_MACOSX_BUNDLE was set.
2014-09-23 10:59:08 -04:00
Kitware Robot 069090e347 CMake Nightly Date Stamp 2014-09-23 00:01:11 -04:00
Pascal Bach e7aeb79f08 VS, WINCE: Only set EntryPointSymbol for executables 2014-09-22 10:23:16 -04:00
Brad King 92b2c6189d Remove extra slashes from LOCATION target property value
In commit v3.0.0-rc1~429^2~2 (Remove the Location member from cmTarget,
2012-10-07) a few extra slashes were added to the path construction
logic, perhaps due to a partially implemented attempt at handling the
case that GetDirectory returns an empty string.  This leads to LOCATION
paths with double slashes in some cases.  Remove them now.
2014-09-22 09:32:21 -04:00
Brad King 0ab2718448 Merge topic 'wix-remember-install-dir'
e785fab5 CPackWiX: Teach WiX installers to remember the install location for upgrades
2014-09-22 09:13:21 -04:00
Brad King 6771c0bbdb Merge topic 'vs-windows-store-certifictes'
d4ca8fb2 VS: Add Certificates to .vcxproj files
2014-09-22 09:13:19 -04:00
Brad King 2b1b1b1cfa Merge topic 'fix-enable_language-missing-module-errors'
1b549a5c enable_language: Fix error messages on missing modules (#15155)
2014-09-22 09:13:11 -04:00
Brad King e6f0bb7b15 Merge topic 'autogen-fixes'
e3c97a19 QtAutogen: Process all ui files in a source file (#14981).
b8877b1d QtAutogen: Add source files to target when only AUTORCC is used.
2014-09-22 09:13:01 -04:00
Brad King d8dde37d60 Merge topic 'minor-cleanups'
80bda168 Simplify use of binary_search.
1927e4ba Remove const char string comparison helper.
2014-09-22 09:12:58 -04:00
Sylvain Joubert 6120fca8e2 Ninja: Prevent compilers to be silently modified
Unlike with Unix Makefiles generator modifying compiler paths was not
protected with Ninja generator.  It was possible to modify them in the
cache without the expected effect on the generated solution.  Also
activate corresponding tests with Ninja.
2014-09-22 08:44:39 -04:00
Kitware Robot 82c8a3b01a CMake Nightly Date Stamp 2014-09-22 00:01:07 -04:00
Kitware Robot 894c1db10b CMake Nightly Date Stamp 2014-09-21 00:01:08 -04:00
Kitware Robot 151bf1aca3 CMake Nightly Date Stamp 2014-09-20 00:01:07 -04:00
Nils Gladitz e785fab54b CPackWiX: Teach WiX installers to remember the install location for upgrades 2014-09-19 22:42:36 +02:00
Gilles Khouzam d4ca8fb2bd VS: Add Certificates to .vcxproj files
After certificates were moved into their own category in
cmGeneratorTarget, that category was not added for output by the VS 10
generator.  Add it now.
2014-09-19 13:46:00 -04:00
Kitware Robot 3689c43a8c CMake Nightly Date Stamp 2014-09-19 00:01:09 -04:00
Brad King 1b549a5c64 enable_language: Fix error messages on missing modules (#15155)
In cmGlobalGenerator::EnableLanguage, fix error messages for missing
module files to actually name the missing module instead of using the
empty string returned by GetModulesFile.
2014-09-18 09:25:26 -04:00
Stephen Kelly e3c97a1914 QtAutogen: Process all ui files in a source file (#14981).
Use a vector to store a list of matched ui_ includes, instead of
overwriting the previous match.
2014-09-18 09:41:16 +02:00
Kitware Robot 201cc6fe09 CMake Nightly Date Stamp 2014-09-18 00:01:09 -04:00
Stephen Kelly 80bda1684d Simplify use of binary_search.
A local string was created when dir was a const char*. Now dir is a
std::string already so the dirString is vestigal.
2014-09-17 15:10:55 +02:00
Stephen Kelly 1927e4bacb Remove const char string comparison helper.
It is now unused.
2014-09-17 15:10:25 +02:00
Stephen Kelly b8877b1d62 QtAutogen: Add source files to target when only AUTORCC is used.
Add missing entry to if condition.
2014-09-17 14:39:42 +02:00
Kitware Robot 7b11f87100 CMake Nightly Date Stamp 2014-09-17 00:01:07 -04:00