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

25702 Commits

Author SHA1 Message Date
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 4a24015afc Tests: Always detect VS and SDK availability on Windows 
Move the detection block out of the Windows >= 8 conditional so it
can be used on other versions.
 2014-09-29 16:05:52 -04:00
Brad King 69fe5920b3 GenerateExportHeader: Avoid if() quoted auto-dereference 
When testing CMAKE_CXX_COMPILER_ID values with if(MATCHES),
do not explicitly dereference or quote CMAKE_CXX_COMPILER_ID.
We want if() to auto-dereference the variable and not its value.
 2014-09-29 15:53:38 -04:00
David Coppa 33f031295c Fix typo in Modules/GNUInstallDirs.cmake (#15176) 
Commit d4fdd9c189 ("GNUInstallDirs: use the
proper default for info and man paths on OpenBSD") introduced a typo.
 2014-09-29 18:25:25 +02:00
Robert Maynard 3da328d38f Make the OSX 10.6+ release x86_64 only. 
We have no need for the 10.6+ bundle to be 32 and 64bit. For older 32bit
machines they should be using the 10.4+ 32bit release.
 2014-09-29 10:00:57 -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
Brad King ea438b3a6d Merge topic 'fix-test-FailedSubmit-match' 
e0acdd1a Tests: Adjust expected error message in FailedSubmit-ftp
 2014-09-29 09:21:41 -04:00
Brad King 0488e4368d Merge topic 'build_cmake_dmg_with_bzip' 
ffa5db96 CMake now using bzip2 compression for mac release bundles.
 2014-09-29 09:21:39 -04:00
Brad King 6e22b8cfa4 Merge topic 'remove-old-DartLocal.conf' 
7a5d9256 Remove unused legacy 'DartLocal.conf' file
 2014-09-29 09:21:37 -04:00
Brad King 87dfc907cf Merge topic 'FindCUDA-cleanup-CMP0054' 
84e3fde9 FindCUDA: Avoid if() auto-dereference in string comparisons
 2014-09-29 09:21:35 -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
KWSys Robot a79ff0e4ed KWSys 2014-09-25 (29ffaf43) 
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ 29ffaf43 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' fb77be5a..29ffaf43
Brad King (1):
      29ffaf43 Suppress deprecation warnings for GetVersionEx

Sean McBride (1):
      6aa1f800 SystemInformation: Fix clang -Wtautological-pointer-compare warning

Change-Id: I29f3dcf2a32e1b80bade233987eb091038aace65
 2014-09-26 09:34:21 -04:00
Tony Kelman e0acdd1a47 Tests: Adjust expected error message in FailedSubmit-ftp 
Error message from cygwin's curl (using `--system-libs`) in
CTestTestFailedSubmit-ftp was:

  Failed to connect to  port 21: Connection timed out
        ^^^

Update our regex to match this.
 2014-09-26 08:34:14 -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
Robert Maynard ffa5db9622 CMake now using bzip2 compression for mac release bundles. 
Starting with OSX 10.4 dmg files offers bzip2 compression which offers
small package sizes.
 2014-09-24 15:39:12 -04:00
Brad King 7a5d9256a3 Remove unused legacy 'DartLocal.conf' file 2014-09-24 10:26:04 -04:00
Adam Strzelecki 84e3fde94d FindCUDA: Avoid if() auto-dereference in string comparisons 
This silences possible CMP0054 warnings.
 2014-09-24 10:10:42 -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 829e9eca04 Merge topic 'doc-toolchains' 
27022166 Help: Add Windows Phone/Store cross-compiling to cmake-toolchains.7
db54d872 Help: Add Windows CE cross-compiling to cmake-toolchains.7 manual
0d72451a Help: Add Cross Compiling subsections in cmake-toolchains.7 manual
 2014-09-22 09:13:17 -04:00
Brad King 405b92d031 Merge topic 'FindGettext-doc-update' 
3919f254 FindGettext: Fix name of GETTEXT_PROCESS_POT_FILE in docs (#15162)
 2014-09-22 09:13:14 -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 3303b5f8b4 Merge topic 'FindProtobuf-depend-protoc' 
e380d7c5 FindProtobuf: Make outputs depend on protoc executable
 2014-09-22 09:13:07 -04:00
Brad King 2f3985c6a5 Merge topic 'FindOpenSceneGraph-pieces-not-found' 
b683da3e FindOpenSceneGraph: Do not add unfound OSG libs if not required
 2014-09-22 09:13:05 -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
Brad King d4713b84b7 Merge topic 'clang-compile-options-cxx14' 
49b8140e Clang: Enable c++14 dialect flag with Clang 3.5.
0b80fc35 Clang: Don't overwrite c++11 compile option value with c++14 flag.
 2014-09-22 09:12:56 -04:00
Brad King f28ebcbf1b Merge topic 'cleanup-CMP0054' 
fa7d47ac Tests: Fix CMP0054 warnings
3b5ea54a CheckPrototypeDefinition: Avoid if() auto-dereference
c9b301cd ExternalProject: Fix CMP0054 warning in _ep_parse_arguments
 2014-09-22 09:12:53 -04:00
Brad King 5eaa3e9025 Merge topic 'ExternalProject-retry' 
30a94eec ExternalProject: Fix download retry logic
 2014-09-22 09:12:50 -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