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

26128 Commits

Author SHA1 Message Date
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
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
Brad King 2702216637 Help: Add Windows Phone/Store cross-compiling to cmake-toolchains.7 
Show simple example toolchain files for each.
 2014-09-19 13:22:22 -04:00
Pascal Bach db54d87287 Help: Add Windows CE cross-compiling to cmake-toolchains.7 manual 2014-09-19 13:18:31 -04:00
Pascal Bach 0d72451a05 Help: Add Cross Compiling subsections in cmake-toolchains.7 manual 
Organize the "Cross Compiling" section into subsections by platform.
This will make it easier to add more subsections for more platforms.
 2014-09-19 13:10:31 -04:00
Kitware Robot 3689c43a8c CMake Nightly Date Stamp 2014-09-19 00:01:09 -04:00
Brad King 3919f254e8 FindGettext: Fix name of GETTEXT_PROCESS_POT_FILE in docs (#15162) 
Rename GETTEXT_PROCESS_POT to GETTEXT_PROCESS_POT_FILE.

Patch-by: maahnat@gmail.com
 2014-09-18 09:39:49 -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
Michael Hanselmann e380d7c5ba FindProtobuf: Make outputs depend on protoc executable 
After updating from Protocol Buffers 2.5.0 to 2.6.0 compilation of the
generated source failed: "This file was generated by an older version of
protoc which is incompatible with your Protocol Buffer headers. Please
regenerate this file with a newer version of protoc.".

Turns out the source and headers generated by way of
FindProtobuf.cmake:PROTOBUF_GENERATE_CPP aren't updated. Adding a
dependency on the compiler executable fixes this issue.
 2014-09-18 09:16:27 -04:00
Mattias Helsing b683da3efa FindOpenSceneGraph: Do not add unfound OSG libs if not required 2014-09-18 09:06:58 -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 49b8140e5d Clang: Enable c++14 dialect flag with Clang 3.5. 2014-09-17 14:57:07 +02:00
Stephen Kelly 0b80fc350a Clang: Don't overwrite c++11 compile option value with c++14 flag. 2014-09-17 14:56:16 +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
Brad King 56af886603 Merge topic 'vs10-wince' 
a3298f77 VS: Teach VS >= 10 generator about Windows CE
 2014-09-16 09:16:40 -04:00
Brad King fa7d47ac5c Tests: Fix CMP0054 warnings 
Hack the CMP0054 warning locally to be an error and run the test suite.
Resolve CMP0054 in Tests/* code as appropriate for each case.
 2014-09-16 09:06:29 -04:00
Brad King 3b5ea54a27 CheckPrototypeDefinition: Avoid if() auto-dereference 
Convert from the old if(MATCHES) hack to if(DEFINED) to check whether
the result variable is already set.
 2014-09-16 09:04:20 -04:00
Kitware Robot b5ac023ba2 CMake Nightly Date Stamp 2014-09-16 00:01:07 -04:00
Matt McCormick c9b301cd71 ExternalProject: Fix CMP0054 warning in _ep_parse_arguments 
Fix the CMP0054 warning:

 CMake Warning (dev) at .../Modules/ExternalProject.cmake:242 (if):
   Policy CMP0054 is not set: Only interpret if() arguments as variables or
   keywords when unquoted.  Run "cmake --help-policy CMP0054" for policy
   details.  Use the cmake_policy command to set the policy and suppress this
   warning.

   Quoted keywords like "COMMAND" will no longer be interpreted as keywords
   when the policy is set to NEW.  Since the policy is not set the OLD
   behavior will be used.
 Call Stack (most recent call first):
   .../Modules/ExternalProject.cmake:1938 (_ep_parse_arguments)
   CMakeLists.txt:5 (ExternalProject_Add)

by avoiding a reference to "${key}" or "COMMAND" in quotes.
 2014-09-15 15:56:37 -04:00
Pascal Bach a3298f7790 VS: Teach VS >= 10 generator about Windows CE 
When CMAKE_SYSTEM_NAME is 'WindowsCE':

* Set the Subsystem and EntryPointSymbol accordingly.
* When CMAKE_SYSTEM_VERSION is 8.0 (Windows CE 2013),
  select the CE800 toolset by default.
 2014-09-15 10:37:40 -04:00
Brad King 0f2defba7d Merge topic 'doc-set_test_properties-example' 
d8054987 Help: Fix set_tests_properties documentation typo
 2014-09-15 10:27:41 -04:00