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

26125 Commits

Author SHA1 Message Date
Brad King c7bd275393 Merge topic 'cached-regex-clear-fixed' 
ceecd790 cmMakefile: store the number of last matches in a CMake var
7878d061 test: add a test for clearing regex results
 2014-12-04 10:23:26 -05:00
Brad King e4665171f4 Merge topic 'fix-add_library-check-for-shared' 
bd360ee3 add_library: Fix target type check for non-shared-lib platforms
 2014-12-04 10:23:24 -05:00
Brad King 09f797c19c Merge topic 'vs-hlsl-typo' 
955fbf29 VS: Fix typo in VS_SHADER_MODEL lookup comment
 2014-12-04 10:23:21 -05:00
Brad King 13fc2ed4c4 Merge topic 'doc-mixed-case-commands' 
607b39dc Utilities/Sphinx: Fix link targets for mixed-case command names
 2014-12-04 10:15:10 -05:00
Brad King 607b39dc11 Utilities/Sphinx: Fix link targets for mixed-case command names 
When a CMake domain 'command' object is defined by CMakeTransform or the
'cmake:command' directive, generate the link target with a lower-case
name even if the command name is not all lower-case.  This is needed to
make cross-references to the command definition work since the
'cmake:command' role is marked with the 'lowercase' property.
 2014-12-04 10:03:26 -05:00
Brad King 44f9a69d34 Merge branch 'release' 2014-12-04 09:10:59 -05:00
Brad King ba98442610 Merge topic 'vs-phone-store-deployment-location' 
352f246f VS: Add source file property to specify Windows App deployment location
 2014-12-04 09:10:05 -05:00
Kitware Robot 0f381ad521 CMake Nightly Date Stamp 2014-12-04 00:01:09 -05:00
Brad King 955fbf29c7 VS: Fix typo in VS_SHADER_MODEL lookup comment 2014-12-03 14:12:32 -05:00
Ben Boeckel ceecd7902f cmMakefile: store the number of last matches in a CMake var 
With PushScope and PopScope, keeping track of another bit of data for
each scope isn't easy. Instead, store it as another CMake variable so it
gets implicitly tracked along with everything else.

This works in a revert of commit
7d674b5f0b.
 2014-12-03 11:06:44 -05:00
Ben Boeckel 7878d06189 test: add a test for clearing regex results 2014-12-03 11:06:44 -05:00
Brad King dc3b222143 Merge branch 'release' 2014-12-03 10:03:51 -05:00
Brad King d90e288b7b Merge topic 'file-LOCK-command' 
93017828 Help: Add notes for topic 'file-LOCK-command'
e6db4c5a file: Add LOCK subcommand to do file and directory locking
05d6531c cmSystemTools: Add StringToInt helper
 2014-12-03 10:02:07 -05:00
Brad King d91feda413 Merge topic 'icase-source-file-prop' 
b7d760ae test: test source file properties with case-insensitivity
 2014-12-03 10:02:05 -05:00
Brad King 9843dfab44 Merge topic 'binary-linux-64' 
7fe6bb0d Utilities/Release: Add build of binary for Linux x86_64
 2014-12-03 10:02:03 -05:00
Brad King cebce135c0 Merge topic 'fix-wince-unicode-entry-point' 
681cda02 VS, WINCE: Fix entry point for Unicode builds
 2014-12-03 10:02:01 -05:00
Brad King beb75b378f Merge topic 'FindPythonInterp-Fix-1.4' 
4c8c3ba9 FindPythonInterp: fix version component variables for Python 1.4 (#15275)
 2014-12-03 10:01:58 -05:00
Brad King eccc5e34cd Merge topic 'CPackIFW-doc-typos' 
4c07a00f CPackIFW: Correction of the module documentation
 2014-12-03 10:01:56 -05:00
Brad King 03b3ee7de2 Merge topic 'xcode-target-search-perf' 
48f78f5f Xcode: use a map to look up target pointers (#15201)
 2014-12-03 10:01:53 -05:00
Brad King 72c4128176 Merge topic 'doc-CMAKE_CXX_KNOWN_FEATURES-typo' 
37d684bd Help: Fix typo in CMAKE_CXX_KNOWN_FEATURES docs
 2014-12-03 10:01:52 -05:00
Brad King b9eac05fb6 Merge topic 'vs-hlsl-settings' 
2a224b4c VS: Add source file properties to set the hlsl shader entry point and model
 2014-12-03 10:01:49 -05:00
Brad King f773e28a8e Merge topic 'doc-Nsight-Tegra-toolchain' 
23e2bd7e Help: Document Nsight Tegra toolchain configuration (#15276)
 2014-12-03 10:01:47 -05:00
Brad King 53fa072e6a Merge topic 'add-continue-command' 
0de867dd continue: Add a new CMake language command for loop continuation (#14013)
 2014-12-03 10:01:44 -05:00
Brad King cf63779f35 Merge topic 'FindOpenGL-revert-imported-targets' 
02e34de2 FindOpenGL: Revert support for imported targets (#15267)
 2014-12-03 10:01:42 -05:00
Brad King 930178283a Help: Add notes for topic 'file-LOCK-command' 2014-12-03 09:47:44 -05:00
Ruslan Baratov e6db4c5a4e file: Add LOCK subcommand to do file and directory locking 
Provide options to fail without blocking or to block up to a timeout.
Provide options to specify the scope containing the lock so it can be
released automatically at the end of a function, file, or process.

Extend the RunCMake.file test with cases covering the file(LOCK) command
usage and error cases.
 2014-12-03 09:47:44 -05:00
Ruslan Baratov 05d6531c7a cmSystemTools: Add StringToInt helper 
Convert a string to a signed integer and reject any extra input.

Co-Author: Rolf Eike Beer <eike@sf-mail.de>
 2014-12-03 09:47:26 -05:00
Brad King 1c104c019a Merge branch 'vs-phone-store-deployment-location' into release 2014-12-03 09:32:42 -05:00
Brad King 7c28e7c172 Merge branch 'vs-hlsl-settings' into release 2014-12-03 09:32:38 -05:00
Brad King 0e7c7bd3df Merge branch 'doc-CMAKE_CXX_KNOWN_FEATURES-typo' into release 2014-12-03 09:32:32 -05:00
Brad King 6c8d573b28 Merge branch 'CPackIFW-doc-typos' into release 2014-12-03 09:32:27 -05:00
Brad King 206117af17 Merge branch 'doc-Nsight-Tegra-toolchain' into release 2014-12-03 09:32:22 -05:00
Gilles Khouzam 352f246f3e VS: Add source file property to specify Windows App deployment location 
Add a VS_DEPLOYMENT_LOCATION source file property to specify where to
put files that are part of the package.  For example:

  set_property(SOURCE ${ASSET_FILES} PROPERTY VS_DEPLOYMENT_LOCATION "assets")

Without this, sources marked with VS_DEPLOYMENT_CONTENT cannot be
located properly.
 2014-12-03 09:31:59 -05:00
Cedric Perthuis 2a224b4ce3 VS: Add source file properties to set the hlsl shader entry point and model 
Create properties VS_SHADER_ENTRYPOINT and VS_SHADER_MODEL.  Without
these many .hlsl source files may not be possible to use.  Extend the
VSWinStorePhone test project to cover them.
 2014-12-03 09:30:59 -05:00
David Demelier 37d684bd67 Help: Fix typo in CMAKE_CXX_KNOWN_FEATURES docs 
Typo "ss defined" => "as defined".
 2014-12-03 09:12:17 -05:00
Brad King 17e1ead25e Merge branch 'fix-wince-unicode-entry-point' into release 2014-12-03 09:08:40 -05:00
Pascal Bach 681cda02bf VS, WINCE: Fix entry point for Unicode builds 
When _UNICODE is defined VS uses wmain instead of main as the entry function.
To make this correctly work on WindowsCE EntryPointSymbol needs to be set to
mainWCRTStartup instead of mainACRTStartup for console applications and to
wWinMainCRTStartup instead of WinMainCRTStartup for GUI applications.

Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
 2014-12-03 09:07:11 -05:00
Brad King bd360ee329 add_library: Fix target type check for non-shared-lib platforms 
When checking target types for TARGET_SUPPORTS_SHARED_LIBS == false,
enumerate exactly the library types not supported rather than trying to
maintain a list of all the types that are supported.  Otherwise

 add_library(SomeImportedLib UNKNOWN IMPORTED)

warns on platforms that do not support shared libraries.

Reported-by: Kelly Thompson <kgt@lanl.gov>
 2014-12-03 08:51:11 -05:00
Kitware Robot 0e466f89fd CMake Nightly Date Stamp 2014-12-03 00:01:08 -05:00
Konstantin Podsvirov 4c07a00f07 CPackIFW: Correction of the module documentation 2014-12-02 15:52:07 -05:00
Brad King 23e2bd7e8c Help: Document Nsight Tegra toolchain configuration (#15276) 2014-12-02 14:40:25 -05:00
Brad King 7fe6bb0d62 Utilities/Release: Add build of binary for Linux x86_64 2014-12-02 14:00:39 -05:00
Ben Boeckel b7d760aea2 test: test source file properties with case-insensitivity 
Some filesystems are case insensitive, so when setting properties on the
files, this should be respected (modulo a policy decision).
 2014-12-02 10:56:36 -05:00
Ben Boeckel 48f78f5f9e Xcode: use a map to look up target pointers (#15201) 
Use an efficient internal lookup to associate cmTarget and cmXCodeObject
instances.
 2014-12-02 10:51:15 -05:00
Brad King 722178fc7e Merge branch 'release' 2014-12-02 10:23:51 -05:00
Brad King f3ae286cc0 Merge branch 'FindOpenGL-revert-imported-targets' into release 2014-12-02 10:23:01 -05:00
Brad King 8c9ff4f1a6 Merge branch 'FindPythonInterp-Fix-1.4' into release 2014-12-02 10:22:50 -05:00
Brad King b85cd1bd69 Merge branch 'doc-compile-features-typo' into release 2014-12-02 10:22:39 -05:00
Brad King c3c251ce0a Merge topic 'FindOpenGL-no-X11' 
d051cbda FindOpenGL: Drop explicit dependency on X11 (#15268)
 2014-12-02 10:21:22 -05:00
Brad King 5bc8282898 Merge topic 'doc-compile-features-typo' 
64f8c533 Help: Fix typo in cmake-compile-features(7) manual
 2014-12-02 10:21:21 -05:00