summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'revert-compiler-links-statically' into releaseBrad King2015-11-237-23/+0
|\
| * Revert "Disable shared library support when compiler links statically" (#15855)Brad King2015-11-237-23/+0
| | | | | | | | | | | | | | | | In commit v3.4.0-rc1~18^2 (Disable shared library support when compiler links statically, 2015-09-30) we tried to detect when the compiler is not capable of linking shared libraries (possibly due to flags in use). However, the approach is not robust against flags like `-nostdlib`. Revert it for now pending another solution to the original problem.
* | Merge branch 'fix-forced-toolchain-dialect' into releaseBrad King2015-11-197-0/+29
|\ \
| * | Project: Guess default standard dialect if compiler was forced (#15852)Brad King2015-11-197-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to commit v3.4.0-rc1~71^2 (Project: Determine default language dialect for the compiler, 2015-09-15) we always guessed the default language standard dialect based on the compiler version. This was not reliable so that commit switched to computing the default language standard dialect while detecting the compiler id. When a toolchain file uses CMakeForceCompiler to set the compiler id then the detection does not occur. Therefore commit v3.4.0-rc1~54^2 (Project: Don't require computed default dialect if compiler was forced, 2015-09-22) made the lack of detection an error only if the compiler was not forced. However, this means that projects using CMakeForceCompiler no longer even get the guess that we had before so <LANG>_COMPILER does not work. Due to the sophistication of CMake's compiler detection logic projects should be ported away from using CMakeForceCompiler. In the meantime, restore a guess of the default language standard dialect when the compiler is forced.
* | | Merge branch 'FindGTest-avoid-CMP0064' into releaseBrad King2015-11-181-3/+3
|\ \ \
| * | | FindGTest: Refactor test type checks to avoid cases triggering CMP0064Brad King2015-11-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update our if() conditions to avoid CMP0064 warnings when `${test_type}` is equal to `TEST`. Reported-by: David T. Chen <dchen@mail.nih.gov>
* | | | Merge branch 'fix-compute-default-dialect-lto' into releaseBrad King2015-11-182-0/+2
|\ \ \ \
| * | | | Make C and C++ default dialect detection robust to advanced optimizationsBrad King2015-11-182-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.4.0-rc1~71^2 (Project: Determine default language dialect for the compiler, 2015-09-15) we added an "INFO:..." string to the compiler id detection binary. The value can be optimized out of the compiler id binary unless we force it to be included by making the program behavior depend on it at runtime. Add references to the value as we do for the other info strings already. Gentoo-Issue: https://bugs.gentoo.org/show_bug.cgi?id=565744
* | | | Merge branch 'cray-fortran-version' into releaseBrad King2015-11-121-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Cray: Implement Fortran compiler version detection (#15845)Brad King2015-11-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | We already recognize the Cray Fortran compiler id. Extract the version number using the same predefined macros we already use for Cray C and C++ compilers.
* | | | Merge branch 'intel-fortran-2016' into releaseBrad King2015-10-291-1/+3
|\ \ \ \
| * | | | Intel: Recognize MSVC version for Intel Fortran 2016 (#15809)Brad King2015-10-261-1/+3
| |/ / /
* | | | Merge branch 'ExternalProject-fix-git-version' into releaseBrad King2015-10-151-1/+2
|\ \ \ \
| * | | | ExternalProject: Always use CMake builtin FindGit (#15791)Brad King2015-10-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unset CMAKE_MODULE_PATH before calling find_package(Git) to ensure we do not get a project-provided FindGit module that may not provide the GIT_VERSION_STRING that we need. We do not need to restore the value explicitly because this occurs inside the _ep_add_download_command function call scope.
| * | | | ExternalProject: Fix Git version report in error message (#15791)Brad King2015-10-151-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.4.0-rc1~77^2~1 (ExternalProject: Use GIT_VERSION_STRING instead of custom method, 2015-09-17) forgot to update the variable name used in an error message.
* | | | Merge branch 'xcode-adjust-deployment-to-host-version' into releaseBrad King2015-10-121-0/+4
|\ \ \ \
| * | | | Xcode: Adjust deployment target SDK version to host versionGregor Jasny2015-10-121-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the automatically selected SDK is newer than the host OS version and no deployment version has been set then adjust the deployment version to the host OS version. Otherwise the user won't be able to launch the executables on the build host. This is for example a problem on a MacOSX 10.10 host with Xcode 7 which only provides a MacOSX10.11 SDK.
* | | | Merge branch 'FindPostgreSQL-v9.5' into releaseBrad King2015-10-121-1/+1
|\ \ \ \
| * | | | FindPostgreSQL: Search for version 9.5Tamar Kranenburg2015-10-121-1/+1
| |/ / /
* | | | Merge branch 'cpack-wix-typos' into releaseBrad King2015-10-121-2/+2
|\ \ \ \
| * | | | CPackWIX: fix typos in documentationKevin Wojniak2015-10-081-2/+2
| |/ / /
* | | | Merge branch 'revert-compiler-features-solaris' into releaseBrad King2015-10-121-19/+13
|\ \ \ \ | |/ / / |/| | |
| * | | Revert topic 'compiler-features-solaris'Brad King2015-10-081-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.4.0-rc1~10^2~2 (Features: Disable support for Oracle SolarisStudio on non-Linux, 2015-09-29) and two follow-up commits. The support of compile features and language standards on Orcale SolarisStudio needs more investigation so for CMake 3.4 we should just act as 3.3 did.
* | | | Merge topic 'vs-win10-store'Brad King2015-10-051-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2402bb8c Help: Document Windows 10 Universal Applications in cmake-toolchains(7) 1be2f12c VS: Add support for Windows 10 Universal (Store) Applications 2798dbda VS: Refactor indentation of LinkLibraryDependencies 8c426183 MSVC: Add system libs for WindowsStore on VS 2015 d1b87d72 VS: Select Windows 10 Store SDK and toolset for VS 2015
| * | | | MSVC: Add system libs for WindowsStore on VS 2015Gilles Khouzam2015-10-021-1/+3
| | | | | | | | | | | | | | | | | | | | Use WindowsApp.lib for a Universal Application Platform project.
* | | | | FindMatlab: Add support for Matlab R2015bFrancesco Romano2015-10-051-0/+1
| | | | |
* | | | | Merge topic 'compiler-features-solaris'Brad King2015-10-021-13/+19
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 5fdf7594 Tests: Suppress WriteCompilerDetectionHeader failure on SunPro c824b23d Features: Fix C++98 flags on Oracle SolarisStudio 12.4 on Linux 61bc0f73 Features: Disable support for Oracle SolarisStudio on non-Linux
| * | | | Features: Fix C++98 flags on Oracle SolarisStudio 12.4 on LinuxBrad King2015-09-301-0/+2
| | | | |
| * | | | Features: Disable support for Oracle SolarisStudio on non-LinuxBrad King2015-09-291-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On SunOS the -std=c++11 flag must be used for linking as well as compiling. Until we implement support for this we cannot support the CXX_STANDARD property except on Linux (where it was tested).
* | | | | Merge topic 'vs-win10-sdk'Brad King2015-10-022-0/+4
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 3f077996 VS: Add support for selecting the Windows 10 SDK (#15670) 5dfc4c5f VS: Add hook to initialize Windows platform settings 61c472a2 cmSystemTools: Add VersionCompareGreater helper
| * | | | VS: Add support for selecting the Windows 10 SDK (#15670)Gilles Khouzam2015-10-022-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the VS 2015 generator to produce a WindowsTargetPlatformVersion value. Use the CMAKE_SYSTEM_VERSION to specify the version and if not set choose a default based on available SDKs. Activate this behavior when targeting Windows 10. Co-Author: Brad King <brad.king@kitware.com>
* | | | | Merge topic 'explicit-system-version'Brad King2015-10-021-1/+3
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | b31ac171 Allow CMAKE_SYSTEM_VERSION to be set without CMAKE_SYSTEM_NAME 70688609 Help: Improve CMAKE_SYSTEM_{NAME,VERSION} variable documentation
| * | | Allow CMAKE_SYSTEM_VERSION to be set without CMAKE_SYSTEM_NAMEGilles Khouzam2015-10-021-1/+3
| |/ / | | | | | | | | | | | | | | | Teach CMakeDetermineSystem to check for a CMAKE_SYSTEM_VERSION setting even when CMAKE_SYSTEM_NAME is not set. This will allow builds on the host OS to target other versions of the OS without full cross-compiling.
* | | Disable shared library support when compiler links staticallyBrad King2015-09-307-0/+23
|/ / | | | | | | | | | | | | | | | | When a user or a compiler wrapper adds '-static' to the compiler flags then it will always link static binaries. Detect this from the compiler id binary and disable TARGET_SUPPORTS_SHARED_LIBS. This will prevent projects from accidentally adding shared libraries when the toolchain does not support them. It also helps CMake avoid linking with flags that require shared libraries to be supported.
* | Merge topic 'ProcessorCount-SunOS-psrinfo'Brad King2015-09-291-8/+21
|\ \ | | | | | | | | | | | | 1ff96bf6 ProcessorCount: Implement with psrinfo tool on recent SunOS versions
| * | ProcessorCount: Implement with psrinfo tool on recent SunOS versionsMarc Chevrier2015-09-281-8/+21
| |/
* | Replace http://www.cmake.org URLs with https://cmake.orgBrad King2015-09-2510-16/+16
| | | | | | | | | | | | | | The latter is now the preferred URL for visiting cmake.org with a browser. Convert using the shell code: git ls-files -z | xargs -0 sed -i 's|http://www\.cmake|https://cmake|g'
* | Merge topic 'Threads-CXX'Brad King2015-09-256-10/+59
|\ \ | |/ |/| | | | | | | | | | | | | | | fff9434d FindThreads: officially announce it works with only C++ enabled 66db914a FindThreads: fix printing a pointer value in test code 0b38424c FindThreads: make the call to try_run() work also if only C++ is enabled 9924a212 FindThreads: replace CheckIncludeFiles by CheckIncludeFile a27bc0cc Check(Function|Library|Symbol)Exists: make it work if only C++ is enabled 7279f293 FindThreads: add simple testcase
| * FindThreads: fix printing a pointer value in test codeRolf Eike Beer2015-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | This causes a warning in C mode, and entirely fails in C++ mode: CMake/Modules/CheckForPthreads.c: In function ‘runner’: CMake/Modules/CheckForPthreads.c:34:27: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] printf("%d CC: %d\n", (int)args, cc); ^ Use %p to print out a pointer value, which will not cause any problems.
| * FindThreads: make the call to try_run() work also if only C++ is enabledRolf Eike Beer2015-09-251-1/+8
| | | | | | | | This isn't enough to make the whole module work with only C++ enabled.
| * FindThreads: replace CheckIncludeFiles by CheckIncludeFileRolf Eike Beer2015-09-251-3/+15
| | | | | | | | | | | | While at it, also add a branch using CheckIncludeFileCXX. Also give a better error message if no supported language is enabled. C++ support isn't working yet, but it has never worked.
| * Check(Function|Library|Symbol)Exists: make it work if only C++ is enabledRolf Eike Beer2015-09-254-5/+35
| |
* | Project: Don't require computed default dialect if compiler was forced.Stephen Kelly2015-09-227-21/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 7235334a (Project: Determine default language dialect for the compiler., 2015-09-15) introduced a mechanism to determine the default dialect used for the running compiler. If conditions in the <CompilerId>-<Lang>.cmake file are such that compile features for that version of the compiler should be supported, the _DEFAULT_STANDARD is set to the computed value. However, the CMakeForceCompiler module allows users to bypass execution of the compiler by CMake. In that case, do not set the _DEFAULT_STANDARD variable at all, which effectively disables the compile-features where the module is used. No compile features have ever been recorded where the module is used so no functionality is lost.
* | Merge topic 'ctest-variable-docs'Brad King2015-09-221-1/+1
|\ \ | |/ |/| | | | | | | | | | | 4da5a227 Help: document CTEST_CUSTOM_* variables 70c0cc72 ctest_read_custom_files: mention that ctest does this automatically 71c67e83 CTEST_CUSTOM_*: treat variables as lists 936a95d4 CTestCoverageCollectGCOV: replace tabulators
| * CTEST_CUSTOM_*: treat variables as listsBen Boeckel2015-09-211-1/+1
| |
* | Merge topic 'pkg-config-variable-function'Brad King2015-09-211-5/+25
|\ \ | |/ |/| | | | | | | 51b83f14 FindPkgConfig: add a command to query arbitrary variables 7f7f1eec FindPkgConfig: use execute_process to strip trailing whitespace
| * FindPkgConfig: add a command to query arbitrary variablesBen Boeckel2015-09-211-3/+23
| |
| * FindPkgConfig: use execute_process to strip trailing whitespaceBen Boeckel2015-09-181-2/+2
| |
* | Merge topic 'cpack-verbatim-variables'Brad King2015-09-211-8/+38
|\ \ | | | | | | | | | | | | bc2e54db Introduction of CPACK_VERBATIM_VARIABLES variable
| * | Introduction of CPACK_VERBATIM_VARIABLES variableRoman Donchenko2015-09-201-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If variable is set to TRUE, values of all variables prefixed with CPACK_ will be escaped so special characters such as dolar sign, quotes or foreward slash will not be lost. By default variable is treated as set to FALSE for back compatibility. The cpack_encode_variables macro is changed into a function to remove scope pollution. There should be no other effects.