summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | FindwxWidgets: Expect wxWidgets 3.1Simon Richter2015-09-091-1/+5
| | |
| * | FindwxWidgets: allow specifying required versionSimon Richter2015-09-091-3/+28
| | |
* | | Merge topic 'FindSWIG-noproxy'Brad King2015-09-101-4/+6
|\ \ \ | | | | | | | | | | | | | | | | 96a8890c FindSWIG: Do not generate erroneous outputs with -noproxy
| * | | FindSWIG: Do not generate erroneous outputs with -noproxyBen Webb2015-09-091-4/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generally for a module foo, SWIG generates (in Python mode) an extension module _foo.so and a proxy Python module foo.py. However, if -noproxy is specified, instead it builds only foo.so (without the leading underscore). The custom command generated by CMake correctly handles the removal of this underscore when -noproxy is given; however, it still adds foo.py to the expected outputs. This upsets build tools that expect foo.py to be generated (for example, 'make' will run the SWIG command twice). Fix this by removing foo.py from the set of extra generated files when -noproxy is specified.
* | | Merge topic 'mingw-compile-features-C'Brad King2015-09-101-2/+2
|\ \ \ | | | | | | | | | | | | | | | | 2fbc41f3 Record compile features for GNU C on Windows (#15727)
| * | | Record compile features for GNU C on Windows (#15727)Brad King2015-09-091-2/+2
| |/ / | | | | | | | | | Drop the 'UNIX' condition on GNU C compiler features.
* | | Merge topic 'ar-option-order'Brad King2015-09-104-4/+4
|\ \ \ | | | | | | | | | | | | | | | | 08659ff4 Re-order 'ar' options 'cq' => 'qc'
| * | | Re-order 'ar' options 'cq' => 'qc'Brad King2015-09-094-4/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documetnation of binutils: https://sourceware.org/binutils/docs/binutils/ar-cmdline.html suggests to use the parameters "q" and "c" in this order ("q" is operation, and "c" is the modifier). Suggested-by: Дилян Палаузов <dilyan.palauzov@aegee.org>
* | | Merge topic 'ghs-updates'Brad King2015-09-101-7/+29
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 04de9007 GHS: Fix generated file path slashes and quoting for 6.1.6 fbe0de92 GHS: Tell MULTI to delete .elf.ael file 63591b94 GHS: Find latest 'int' directory
| * | GHS: Find latest 'int' directoryGeoff Viola2015-09-091-7/+29
| |/
* | Merge topic 'more-swift2-fixes'Brad King2015-09-092-2/+52
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 9cdf6ef4 Swift: Add proper Swift compiler test 1aa29f0d Swift: Remove positive Swift language tests d778a1c2 Swift: Require Xcode 6.1 and for MacOS X at least SDK 10.10 4da60024 Swift: Fix Compiler-Id detection for Swift 2 874a265c Swift: Make SwiftMix compatible with Swift 2
| * | Swift: Add proper Swift compiler testGregor Jasny2015-09-061-1/+51
| | | | | | | | | | | | | | | This catches for example the unavailability of Swift with Xcode Beta6 and macosx10.10 SDK.
| * | Swift: Fix Compiler-Id detection for Swift 2Gregor Jasny2015-09-031-1/+1
| | |
* | | Merge topic 'wbpvf_no_deref'Brad King2015-09-093-14/+14
|\ \ \ | |_|/ |/| | | | | | | | ea080e3e write_basic_package_version_file: remove variable dereferences in templates
| * | write_basic_package_version_file: remove variable dereferences in templatesRolf Eike Beer2015-09-043-14/+14
| |/ | | | | | | Fixes some minor whitespace issues in the if()s.
* | Merge topic 'FindOpenSSL-static-libs'Brad King2015-09-081-5/+30
|\ \ | | | | | | | | | | | | 369a8cde FindOpenSSL: Optionally search only for static libraries
| * | FindOpenSSL: Optionally search only for static librariesThijs Wenker2015-09-021-5/+30
| |/ | | | | | | | | | | | | Add an OPENSSL_USE_STATIC_LIBS option to enable it. Adjust CMAKE_FIND_LIBRARY_SUFFIXES to only look for .a and .lib files. Also adjust the search paths on Windows for installer locations of static libraries.
* | FindZLIB: Find debug and release variants separatelyMichael Scott2015-09-021-5/+40
|/ | | | | | Provide each variant in ZLIB_LIBRARIES and ZLIB::ZLIB imported location properties when one is found, while maintaining support for manually setting the library via ZLIB_LIBRARY.
* FindHDF5: Add hdf5_hl to list of libraries to search for Fortran_HLPaul Romano2015-09-011-1/+1
| | | | | | | When the Fortran_HL component is specified, the hdf5_hl library is not included in HDF5_LIBRARIES which causes a bunch of undefined references at link time. This commit adds hdf5_hl to the list of libraries to search for when the Fortran_HL component is specified.
* FindHDF5: Fix support for HL and Fortran_HL componentsPaul Romano2015-09-011-0/+2
| | | | | | Define HDF5_{Fortran_,}HL_COMPILE_LINE so that HDF5_{Fortran_,}HL_INCLUDE_DIR and HDF5_{Fortran_,}HL_LIBRARIES are found when the macro is invoked for HL and Fortran_HL components. (Use patch from debian cmake-data package.)