summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'doc-mixed-case-commands'Brad King2014-12-041-2/+10
|\ | | | | | | | | 607b39dc Utilities/Sphinx: Fix link targets for mixed-case command names
| * Utilities/Sphinx: Fix link targets for mixed-case command namesBrad King2014-12-041-2/+10
| | | | | | | | | | | | | | | | 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.
* | Merge branch 'release'Brad King2014-12-040-0/+0
|\ \
| * \ Merge branch 'vs-phone-store-deployment-location' into releaseBrad King2014-12-038-12/+45
| |\ \
* | \ \ Merge topic 'vs-phone-store-deployment-location'Brad King2014-12-048-12/+45
|\ \ \ \ | | |/ / | |/| | | | | | | | | | 352f246f VS: Add source file property to specify Windows App deployment location
| * | | VS: Add source file property to specify Windows App deployment locationGilles Khouzam2014-12-038-12/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | CMake Nightly Date StampKitware Robot2014-12-041-1/+1
| | | |
* | | | Merge branch 'release'Brad King2014-12-030-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'vs-hlsl-settings' into releaseBrad King2014-12-038-5/+50
| |\ \ \ | | |/ /
| * | | Merge branch 'doc-CMAKE_CXX_KNOWN_FEATURES-typo' into releaseBrad King2014-12-031-1/+1
| |\ \ \
| * \ \ \ Merge branch 'CPackIFW-doc-typos' into releaseBrad King2014-12-031-11/+11
| |\ \ \ \
| * \ \ \ \ Merge branch 'doc-Nsight-Tegra-toolchain' into releaseBrad King2014-12-032-0/+21
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-wince-unicode-entry-point' into releaseBrad King2014-12-031-2/+16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'FindOpenGL-revert-imported-targets' into releaseBrad King2014-12-022-43/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'FindPythonInterp-Fix-1.4' into releaseBrad King2014-12-021-2/+2
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'file-LOCK-command'Brad King2014-12-0363-0/+1352
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Help: Add notes for topic 'file-LOCK-command'Brad King2014-12-031-0/+5
| | | | | | | | | | |
| * | | | | | | | | | file: Add LOCK subcommand to do file and directory lockingRuslan Baratov2014-12-0360-0/+1336
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | cmSystemTools: Add StringToInt helperRuslan Baratov2014-12-032-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert a string to a signed integer and reject any extra input. Co-Author: Rolf Eike Beer <eike@sf-mail.de>
* | | | | | | | | | | Merge topic 'icase-source-file-prop'Brad King2014-12-034-0/+40
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7d760ae test: test source file properties with case-insensitivity
| * | | | | | | | | | | test: test source file properties with case-insensitivityBen Boeckel2014-12-024-0/+40
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some filesystems are case insensitive, so when setting properties on the files, this should be respected (modulo a policy decision).
* | | | | | | | | | | Merge topic 'binary-linux-64'Brad King2014-12-032-0/+24
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7fe6bb0d Utilities/Release: Add build of binary for Linux x86_64
| * | | | | | | | | | | Utilities/Release: Add build of binary for Linux x86_64Brad King2014-12-022-0/+24
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'fix-wince-unicode-entry-point'Brad King2014-12-031-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 681cda02 VS, WINCE: Fix entry point for Unicode builds
| * | | | | | | | | | | VS, WINCE: Fix entry point for Unicode buildsPascal Bach2014-12-031-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | | | Merge topic 'FindPythonInterp-Fix-1.4'Brad King2014-12-031-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c8c3ba9 FindPythonInterp: fix version component variables for Python 1.4 (#15275)
| * | | | | | | | | | | FindPythonInterp: fix version component variables for Python 1.4 (#15275)Rolf Eike Beer2014-12-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was introduced in "FindPythonInterp: rework the version detection" 7d6db93de9ffc6e6092fa722aaf9c057dadcd634.
* | | | | | | | | | | | Merge topic 'CPackIFW-doc-typos'Brad King2014-12-031-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c07a00f CPackIFW: Correction of the module documentation
| * | | | | | | | | | | CPackIFW: Correction of the module documentationKonstantin Podsvirov2014-12-021-11/+11
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'xcode-target-search-perf'Brad King2014-12-032-8/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48f78f5f Xcode: use a map to look up target pointers (#15201)
| * | | | | | | | | | | Xcode: use a map to look up target pointers (#15201)Ben Boeckel2014-12-022-8/+10
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use an efficient internal lookup to associate cmTarget and cmXCodeObject instances.
* | | | | | | | | | | Merge topic 'doc-CMAKE_CXX_KNOWN_FEATURES-typo'Brad King2014-12-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37d684bd Help: Fix typo in CMAKE_CXX_KNOWN_FEATURES docs
| * | | | | | | | | | Help: Fix typo in CMAKE_CXX_KNOWN_FEATURES docsDavid Demelier2014-12-031-1/+1
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Typo "ss defined" => "as defined".
* | | | | | | | | | Merge topic 'vs-hlsl-settings'Brad King2014-12-038-5/+50
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a224b4c VS: Add source file properties to set the hlsl shader entry point and model
| * | | | | | | | | VS: Add source file properties to set the hlsl shader entry point and modelCedric Perthuis2014-12-038-5/+50
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge topic 'doc-Nsight-Tegra-toolchain'Brad King2014-12-032-0/+21
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | 23e2bd7e Help: Document Nsight Tegra toolchain configuration (#15276)
| * | | | | | | | Help: Document Nsight Tegra toolchain configuration (#15276)Brad King2014-12-022-0/+21
| |/ / / / / / /
* | | | | | | | Merge topic 'add-continue-command'Brad King2014-12-0331-2/+241
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0de867dd continue: Add a new CMake language command for loop continuation (#14013)
| * | | | | | | | continue: Add a new CMake language command for loop continuation (#14013)Gregor Jasny2014-12-0131-2/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired-by: Doug Barbieri Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | | | | Merge topic 'FindOpenGL-revert-imported-targets'Brad King2014-12-032-43/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | 02e34de2 FindOpenGL: Revert support for imported targets (#15267)
| * | | | | | | | FindOpenGL: Revert support for imported targets (#15267)Brad King2014-12-012-43/+0
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the feature added by commit v3.1.0-rc1~420^2~2 (FindOpenGL: Provide imported targets for GL and GLU, 2014-05-31). Unfortunately it does not work on Windows because the full path to each library file is not actually known. The IMPORTED_LOCATION of an imported target must be a full path, but OPENGL_gl_LIBRARY is just 'opengl32' on Windows because the actual library file is in some implicit link directory that we may know know. More infrastructure will be needed in CMake to allow a name-only imported library. Until that exists, we will not be able to provide imported targets in FindOpenGL.
* | | | | | | | CMake Nightly Date StampKitware Robot2014-12-031-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'release'Brad King2014-12-020-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'doc-compile-features-typo' into releaseBrad King2014-12-021-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'link-no-empty-response-files' into releaseBrad King2014-12-011-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fix-implicit-lib-logging' into releaseBrad King2014-12-011-1/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge topic 'FindOpenGL-no-X11'Brad King2014-12-022-13/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d051cbda FindOpenGL: Drop explicit dependency on X11 (#15268)
| * | | | | | | | | FindOpenGL: Drop explicit dependency on X11 (#15268)Brad King2014-12-012-13/+8
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 079e8469ab (... OpenGL always needs X11 on Unix, 2002-09-05) the FindOpenGL module was taught to search for X11 as a dependency of the OpenGL library. This was done without a detailed explanation, and the dependency should not be explicitly needed because OpenGL headers should not expose applications to X11 APIs directly. Unfortunately the only way to know if anything legitimately depends on this behavior (perhaps in static library cases) is to simply remove it and wait for issues to be reported. If so, then we can add some kind of compatibility setting for this later. Add a release note to draw attention to this change. Reported-by: Dainius "GreatEmerald" Masiliƫnas <pastas4@gmail.com>
* | | | | | | | | Merge topic 'doc-compile-features-typo'Brad King2014-12-021-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | 64f8c533 Help: Fix typo in cmake-compile-features(7) manual
| * | | | | | | | Help: Fix typo in cmake-compile-features(7) manualDavid Demelier2014-12-021-1/+1
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Fix spelling 'execptions' => 'exceptions'.