summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | Merge topic 'ms-manifest-files'Brad King2015-09-181-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e134e53b Add support for *.manifest source files with MSVC tools da00be63 MSVC: Rewrite manifest file handling with Makefile and Ninja d488b5c9 Ninja: Always add OBJECT_DIR variable to link rules 6d620f5a VS: Add manifest tool settings to VS 8 and 9 project files
| * | | | Add support for *.manifest source files with MSVC toolsBrad King2015-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Classify .manifest sources separately, add dependencies on them, and pass them to the MS manifest tool to merge with linker-generated manifest files. Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
| * | | | MSVC: Rewrite manifest file handling with Makefile and NinjaBrad King2015-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a helper class private to "cmcmd.cxx" to contain the implementation. Update the link logic to use the intermediate files directory for each target to hold manifest and resource files before embedding into the binary. Preserve the old behavior of placing the .manifest file next to the binary when not linking incrementally even though it will be embedded.
* | | | | Merge topic 'ExternalProject_stash_save_all'Brad King2015-09-181-17/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | 7c5b6ed5 ExternalProject: Use "git stash save --all" only if supported (#15722) b04c3815 ExternalProject: Use GIT_VERSION_STRING instead of custom method
| * | | | ExternalProject: Use "git stash save --all" only if supported (#15722)Daniele E. Domenichelli2015-09-171-1/+6
| | | | | | | | | | | | | | | | | | | | The --all option for git-stash wasn't introduced until git version 1.7.6.
| * | | | ExternalProject: Use GIT_VERSION_STRING instead of custom methodDaniele E. Domenichelli2015-09-171-16/+1
| | | | | | | | | | | | | | | | | | | | GIT_VERSION_STRING is available in FindGit.cmake since CMake version 2.8.8
* | | | | Merge topic 'cpack-deb-fakeroot-removal'Brad King2015-09-171-7/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | becb14c9 CPack/DEB: test preserve extra config file permissions 7044e8ee CPackDeb: use of libarchive and removal of fakeroot 415405a3 cmArchiveWrite: control user/group, permissions and recursive file adding 4f2ff601 Tests: Make RunCMake.CPack error messages more readable 81b748ae cmGeneratedFileStream: Fix spelling in comment
| * | | | | CPackDeb: use of libarchive and removal of fakerootRaffi Enficiaud2015-09-171-7/+32
| | | | | |
* | | | | | Merge topic 'FindPython-updates'Brad King2015-09-172-10/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | ea2db3bb FindPythonLibs: Fix OS X framework include directory search path c57334fa FindPythonLibs: Remove PYTHON_INCLUDE_PATH as input 2db092b1 FindPython{Interp,Libs}: Add versions 3.5 and 3.6
| * | | | FindPythonLibs: Fix OS X framework include directory search pathDavid Gobbi2015-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use PATH_SUFFIXES to append "python<v>" to each candidate path. Do not append it to the constructed list of python framework include directories. Otherwise the combined path will never exist. Note that the code doesn't yet try to match the suffixes "m" and "u" between the executable, library, and include directory.
| * | | | FindPythonLibs: Remove PYTHON_INCLUDE_PATH as inputDavid Gobbi2015-09-161-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cmake variable has been deprecated for over a decade, and using it as an input could potentially cause unexpected results. We still need to keep it as an output variable for compatibility though.
| * | | | FindPython{Interp,Libs}: Add versions 3.5 and 3.6David Gobbi2015-09-162-2/+2
| | |/ / | |/| |
* | | | Modules: Drop unused VTK 4.0 support modulesBrad King2015-09-163-476/+0
|/ / / | | | | | | | | | | | | These modules have been unused since commit v3.1.0-rc1~355^2 (FindVTK: Drop support for finding VTK 4.0, 2014-06-27).
* | | FindProtobuf: Add protobuf_generate_python functionAndreas Bergmeier2015-09-151-4/+63
| |/ |/|
* | Merge topic 'FindHDF5-updates'Brad King2015-09-141-4/+24
|\ \ | | | | | | | | | | | | fd26a19a FindHDF5: Add NAMES_PER_DIR and introduce HDF5_PREFER_PARALLEL
| * | FindHDF5: Add NAMES_PER_DIR and introduce HDF5_PREFER_PARALLELPaul Romano2015-09-111-4/+24
| |/ | | | | | | | | | | | | The calls to find_program now use NAMES_PER_DIR so that the first executable (e.g. h5pcc) appearing on their PATH will get chosen. The HDF5_PREFER_PARALLEL variable swaps the search order when it is set to true in the event that a directory being search contains both h5cc and h5pcc.
* | CMakeParseImplicitLinkInfo: Do not match "VAR=..." as link line (#15737)Brad King2015-09-111-1/+1
|/ | | | | | | | | | | | | | | When compiling with LDFLAGS='-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld' the compiler output includes a line like COLLECT_GCC_OPTIONS='-specs=/usr/lib/rpm/redhat/redhat-hardened-ld' ... that our link line regex matches due to an argument ending in "-ld". Since it is not really the link line no implicit link information is dectected. Exclude "VAR=..." lines from consideration as link lines to fix this.
* Features: Extract strings from test binary more reliably (#15736)Brad King2015-09-101-1/+1
| | | | | | | | | | Since commit v3.1.0-rc1~635^2~7 (project: Add infrastructure for recording CXX compiler features, 2013-10-17) we compile a test source to a binary and then extract "<LANG>_FEATURES:..." strings from the binary with the file(STRINGS) command. Add a newline at the beginning of the string literal to be sure file(STRINGS) can extract the first entry as a string independent of whatever else the compiler may put before the storage it allocates for the literal within the binary.
* Merge topic 'cpack-cmake-special-characters-mangling'Brad King2015-09-101-43/+48
|\ | | | | | | | | 2a7772ff CPack: don't mangle CMake-special characters when applying default settings
| * CPack: don't mangle CMake-special characters when applying default settingsRoman Donchenko2015-09-091-43/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mangling is prevented by using a function instead of a macro for setting default value of some CPack variables. Function is meant for internal use in CPack.cmake only. Old macro is deprecated but kept for backwards compatibility - was intended for internal use only as it can't be used for CPack after CPack.cmake script is included. Patch removes local workarounds that were required by old macro, fixes default setting of variables that by default inherit value from another variable that already went through old default setting macro (e.g. value of CPACK_PACKAGE_INSTALL_REGISTRY_KEY caused error for wrong escapes if CPACK_PACKAGE_INSTALL_DIRECTORY contained escaped back slashes) and provides a test for correct escaping of characters.
* | Merge topic 'cpack-deb-component-dependencies'Brad King2015-09-101-16/+60
|\ \ | | | | | | | | | | | | 4de7c812 CPack/Deb: enable per component setting of dependencies
| * | CPack/Deb: enable per component setting of dependenciesDomen Vrankar2015-09-091-16/+60
| |/
* | Merge topic 'FindwxWidgets-updates'Brad King2015-09-101-5/+34
|\ \ | | | | | | | | | | | | | | | | | | | | | d8e233d8 Help: Add notes for topic 'FindwxWidgets-updates' 15aacb68 FindwxWidgets: Add wxWidgets webview component 8122fbd0 FindwxWidgets: Expect wxWidgets 3.1 6089fde5 FindwxWidgets: allow specifying required version
| * | FindwxWidgets: Add wxWidgets webview componentSimon Richter2015-09-091-1/+1
| | |