summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cpack-wix-typos'Brad King2015-10-121-2/+2
|\ | | | | | | | | fb9ec243 CPackWIX: fix typos in documentation
| * CPackWIX: fix typos in documentationKevin Wojniak2015-10-081-2/+2
| |
* | Merge topic 'revert-compiler-features-solaris'Brad King2015-10-121-19/+13
|\ \ | | | | | | | | | | | | 340d0897 Revert topic 'compiler-features-solaris'
| * | 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 'FindGTK2_sigc++_c++11'Brad King2015-10-121-0/+58
|\ \ \ | | | | | | | | | | | | | | | | 3d9e3d7b FindGTK2: Enable c++11 for sigc++ 2.5.1 or later
| * | | FindGTK2: Enable c++11 for sigc++ 2.5.1 or laterDaniele E. Domenichelli2015-10-121-0/+58
| | |/ | |/| | | | | | | | | | | | | | | | Starting with sigc++ 2.5.1, c++11 must be enabled in order to use sigc++. The GTK2::sigc++ imported target will automatically enable the required build flags in order to build with the version found on the system.
* | | Merge topic 'FindOpenSSL-mingw'Brad King2015-10-081-7/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | 1bf66fed FindOpenSSL: Search for unix-named libraries first on MinGW (#15765) 6b575dec FindOpenSSL: Tolerate tabs in header while parsing version (#15765)
| * | | FindOpenSSL: Search for unix-named libraries first on MinGW (#15765)Wayne Stambaugh2015-10-061-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize the change made by commit v2.8.10~228^2~4 (FindOpenSSL: find cross-compiled OpenSSL from MinGW, 2012-07-23) to be used on builds hosted on Windows too. When building for MinGW, consider library names that come with MinGW before looking for the main Windows distribution of OpenSSL.
| * | | FindOpenSSL: Tolerate tabs in header while parsing version (#15765)Wayne Stambaugh2015-10-061-1/+1
| | | | | | | | | | | | | | | | Tolerate tabs instead of spaces in the "# define" line.
* | | | Merge topic 'cpack-nsis-bitmap'Brad King2015-10-082-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3758af12 CPackNSIS: Add options to set the bitmap for NSIS installer left side
| * | | | CPackNSIS: Add options to set the bitmap for NSIS installer left sideColin Tracey2015-10-062-0/+10
| | |/ / | |/| | | | | | | | | | | | | | set MUI_WELCOMEFINISHPAGE_BITMAP set MUI_UNWELCOMEFINISHPAGE_BITMAP
* | | | Merge topic 'fix-spelling-typos'Brad King2015-10-085-5/+5
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | 06247384 bootstrap: Fix spelling of "succeeded" b6702d40 Modules: Fix spelling of "succeeded" in check messages
| * | | Modules: Fix spelling of "succeeded" in check messagesTerrell Russell2015-10-065-5/+5
| |/ / | | | | | | | | | Change "succeded" to "succeeded" everywhere.
* | | FindOpenSSL: Add support for static MSVC runtimeThijs Wenker2015-10-051-5/+12
|/ / | | | | | | | | Add an OPENSSL_MSVC_STATIC_RT option to switch from the default search for `/MD` libraries to look for `/MT` libraries instead.
* | 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.
* | | Ninja: Detect MSVC /showIncludes prefix with compiler flags (#15596)Brad King2015-09-186-38/+41
| | | | | | | | | | | | | | | | | | | | | | | | Move detection over to the compiler id logic where we have already constructed the list of compiler flags from ARG1 and CMAKE_<LANG>_FLAGS. Pass the flags when we execute "cl" with "/showIncludes". Also pass "/c" because we only need to compile, not link. Check the compiler process exit code before trusting its output.
* | | Ninja: Refactor lookup of cmcldeps locationBrad King2015-09-183-4/+0
| | | | | | | | | | | | | | | This executable comes with CMake so just compute its location in cmSystemTools instead of storing it in compiler information modules.
* | | CMakeDetermineCompilerId: Drop unused code pathBrad King2015-09-181-23/+11
|/ / | | | | | | | | The execute_process command always exists so we never need to fall back on exec_program.
* | Merge topic 'compute-default-dialect'Brad King2015-09-1812-15/+62
|\ \ | | | | | | | | | | | | 7235334a Project: Determine default language dialect for the compiler.
| * | Project: Determine default language dialect for the compiler.Stephen Kelly2015-09-1812-15/+62
| | | | | | | | | | | | | | | | | | Use the __cplusplus and __STDC_VERSION__ macros to automatically determine the default dialect for the compiler while determining its id and version.
* | | Merge topic 'FindPython-updates'Brad King2015-09-181-19/+60
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 19934b67 FindPythonLibs: unset temporary _PREFIX variable f8bc4e11 FindPythonLibs: Use python executable prefix as a hint a9d32dff FindPythonLibs: Match include dir to library version
| * | | FindPythonLibs: unset temporary _PREFIX variableDavid Gobbi2015-09-171-11/+14
| | | | | | | | | | | | | | | | To avoid pollution, unset variables that are only meant for local use.
| * | | FindPythonLibs: Use python executable prefix as a hintDavid Gobbi2015-09-171-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | If PYTHON_EXECUTABLE is set, then we should look for the libs in the same prefix, e.g. /usr/local/python -> /usr/local/lib, and on Win32 /Python34/python.exe -> /Python34/libs.
| * | | FindPythonLibs: Match include dir to library versionDavid Gobbi2015-09-171-19/+36
| | | | | | | | | | | | | | | | | | | | | | | | This commit ensures that FindPythonLibs has found the library before before the search for the include dir begins. The library prefix and version can then be used to find the matching include dir.