summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* try_compile: Pass linker flags into test project (#14066)Brad King2014-12-0311-0/+167
| | | | | | | | | | | | Copy CMAKE_EXE_LINKER_FLAGS into the test project generated by try_compile, just like we already copy CMAKE_<LANG>_FLAGS. Add CMake Policy CMP0056 to activate this behavior in a compatible way, but do not warn by default when the policy is not set since it will affect all try_compile calls. Extend the RunCMake.try_compile test with a case covering this behavior for each policy setting.
* CMakeDetermineCompilerABI: Use normal linker flags in ABI projectBrad King2014-12-032-1/+3
| | | | | | | | | When compiling the ABI detection test project, do not override CMAKE_EXE_LINKER_FLAGS completely. The normally selected value of this variable may influence how the link is done and may be needed to be representative of how the calling project will be built. Instead pass a variable that try_compile will reference as additional flags. Leave this behavior of try_compile undocumented for now.
* 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'.
* | | | | | | Merge topic 'fix-implicit-lib-logging'Brad King2014-12-021-1/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | 20bf6971 CMakeParseImplicitLinkInfo: Fix implicit library logging
| * | | | | | CMakeParseImplicitLinkInfo: Fix implicit library loggingBrad King2014-12-011-1/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.1.0-rc1~640^2~5 (Clean up usage of if(... MATCHES regex) followed string(REGEX REPLACE regex), 2014-04-06) we accidentally broke logging of the implicit library detection. Restore use of the intermediate 'lib' variable so that the log message is constructed properly. Reported-by: Bill Somerville <bill@classdesign.com>
* | | | | | Merge topic 'link-no-empty-response-files'Brad King2014-12-021-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | 1c5be1f3 Makefile: Do not create an empty linker response file
| * | | | | Makefile: Do not create an empty linker response fileBrad King2014-12-011-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~821^2 (Windows: Use response files to specify link libraries for GNU tools, 2014-03-04) we use a response file to pass possibly long linker flag lists to the GNU linker on Windows. On MinGW, this may cause gfortran to use a response file to pass some flags to its own internal invocation. This is okay except when we are parsing implicit link flags from the compiler ABI detection build. If gfortran uses a response file in that case then we may miss extracting some of the implicit link flags, such as -lgfortran. Fortunately, in the compiler ABI detection case we do not actually link to anything so the response file is empty. Work around this problem by simply not using a response file when the list of flags it is used to pass is empty (or just whitespace). Reported-by: Bill Somerville <bill@classdesign.com>
* | | | | Merge topic 'FindOpenSSL-separate-libs'Brad King2014-12-022-4/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | be9bec5d FindOpenSSL: Report crypto and ssl libraries separately