summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge topic 'FindZLIB-per-config'Brad King2015-09-082-5/+45
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 11097f52 FindZLIB: Find debug and release variants separately
| * | | | | FindZLIB: Find debug and release variants separatelyMichael Scott2015-09-022-5/+45
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge topic 'update-kwsys'Brad King2015-09-0844-3473/+1396
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2b8229d Tests: Fix Plugin test on Watcom compiler 89958fd0 bootstrap: Remove unused KWSys configuration c5cc3441 Merge branch 'upstream-kwsys' into update-kwsys 1b79433a KWSys 2015-08-28 (dc3fdd7f)
| * | | | | Tests: Fix Plugin test on Watcom compilerBrad King2015-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Watcom compiler does not have stream operators for std::string. Since KWSys no longer provides the operators for us, just use c_str() to avoid the problem and allow the test to compile on Watcom.
| * | | | | bootstrap: Remove unused KWSys configurationBrad King2015-09-021-269/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KWSys has removed support for kwsys_ios, kwsys_stl, and pre-c++98 template compatibility layers. Drop the bootstrap script checks for these and configuration of the compatibility headers we no longer use.
| * | | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-09-0242-3203/+1394
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | KWSys 2015-08-28 (dc3fdd7f)KWSys Robot2015-09-0242-3203/+1394
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ dc3fdd7f | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' cdaf522c..dc3fdd7f Brad King (9): 15a16826 Remove include <kwsys/ios/*> and kwsys_ios:: compatibility layer a5799c17 Remove unused KWSYS_IOS_USE_{SSTREAM,STRSTREAM_H,STRSTREA_H} checks 198957cf Remove unused KWSYS_IOS_USE_SSTREAM check 24d2b60e Remove support for pre-C++98 streams 2a581c30 Remove support for pre-C++98 std::string missing operators 5f3fd465 Remove support for pre-C++98 STL cded1574 Remove support for pre-C++98 STL from hash_map and hash_set f130a3ab Remove kwsys/cstddef compatibility header dc3fdd7f Remove support for pre-C++98 template capabilities
* | | | | | CMake Nightly Date StampKitware Robot2015-09-081-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-09-071-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-09-061-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2015-09-051-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2015-09-041-1/+1
| |_|/ |/| |
* | | Merge topic 'release-scripts-doc-dir'Brad King2015-09-038-11/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | 6f7edb87 Utilities/Release: Install docs in unversioned directory (#15692) 7d891cde Utilities/Release: Refactor bootstrap argument construction
| * | | Utilities/Release: Install docs in unversioned directory (#15692)Brad King2015-09-026-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our upstream-built release tarballs already contain many unversioned paths and so will never overlap with another version of CMake in the same installation prefix. Therefore we do not need a versioned name for the documentation directory. Configure our release binaries to place the documentation in an unversioned directory so that one can use the same path to refer to the documentation locally even after updating CMake. For example, on OS X one may see the documentation in `/Applications/CMake.app/Contents/doc/cmake/html/index.html`.
| * | | Utilities/Release: Refactor bootstrap argument constructionBrad King2015-09-026-11/+8
| |/ / | | | | | | | | | | | | Pass needed bootstrap arguments directly instead of constructing them from various conditions.
* | | Merge topic 'add-link-search-static-properties-defaults'Brad King2015-09-036-2/+8
|\ \ \ | | | | | | | | | | | | | | | | 18d7f8fb Tests: Move LINK_SEARCH_{START,END}_STATIC case to dedicated test
| * | | Tests: Move LINK_SEARCH_{START,END}_STATIC case to dedicated testBrad King2015-09-026-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test case added to RunCMake.set_property by commit 675ef165 (Allow LINK_SEARCH_{START,END}_STATIC props to have default values, 2015-08-07) is not a test of the set_property command and so belongs in its own test case. Create a new RunCMake.LinkStatic test to cover cases related to static linking. While at it, simplify the LINK_SEARCH_STATIC test case to enable only C.
* | | | Merge topic 'vs-store-phone-cert-thumbs'Brad King2015-09-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7c33b0f9 cmSystemTools: Skip ComputeCertificateThumbprint during bootstrap
| * | | | cmSystemTools: Skip ComputeCertificateThumbprint during bootstrapBrad King2015-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The implementation of this method requires linking to some extra system libraries. Simply leave it out of the bootstrap-built CMake.
* | | | | CMake Nightly Date StampKitware Robot2015-09-031-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'FindHDF5-updates'Brad King2015-09-021-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | f7f73df1 FindHDF5: Add hdf5_hl to list of libraries to search for Fortran_HL 19e7db07 FindHDF5: Fix support for HL and Fortran_HL components
| * | | | 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.)
* | | | | Merge topic 'swift2-compatibility'Brad King2015-09-022-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 61b6d52a Swift: Use dump instead of println
| * | | | | Swift: Use dump instead of printlnGregor Jasny2015-09-012-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Swift 2.0 in Xcode7 the println function was renamed into print. Use dump function instead which adds newlines like println.
* | | | | | Merge topic 'modules-no-soname'Brad King2015-09-023-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21d99aa3 Tests: Use a less strict regular expression to look for "SONAME"
| * | | | | | Tests: Use a less strict regular expression to look for "SONAME"Raphael Kubo da Costa2015-09-013-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 899458ab (Tests: Cover NO_SONAME property for SHARED libraries, 2015-08-20) introduced a few new ExportImport tests, and the check_lib_{no}soname.cmake scripts that parse readelf(1)'s output. Make the regular expression matching the SONAME line output by readelf less strict, as the output format varies across implementations: GNU binutils' readelf is the only one to write each ELF header within parentheses (which the previous regular expression expected). The new tests were thus failing when either Fedora's elfutils (eu-readelf) or elftoolchain's readelf (present on recent FreeBSD versions) were being used, as they both list the headers without parentheses. The same issue also affected Tests/Plugin's check_mod_soname.cmake, so fix that one as well -- the only reason the test was not failing is that it tested that the regular expression did not match, which was always the case with a non-binutils readelf.
* | | | | | | CMake Nightly Date StampKitware Robot2015-09-021-1/+1
| | | | | | |
* | | | | | | Merge topic 'drop-cmsys-std-layer'Brad King2015-09-011-10/+10
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | 76fa8596 Tests: Remove use of include <kwsys/{ios,stl}> and kwsys_{ios,stl}::
| * | | | | | Tests: Remove use of include <kwsys/{ios,stl}> and kwsys_{ios,stl}::Brad King2015-08-311-10/+10
| | |/ / / / | |/| | | | | | | | | | | | | | | | We no longer need this compatibility layer for the compilers we support.
* | | | | | Merge topic 'jacoco_find_files'Brad King2015-09-011-52/+87
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e92c59e7 ctest_coverage: Make Jacoco parser better at finding source files
| * | | | | | ctest_coverage: Make Jacoco parser better at finding source filesZack Galbreath2015-09-011-52/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of searching for source files in a couple hard-coded locations, we now search the source and binary directory for files matching both the name of the covered file and its package directory structure.
* | | | | | | Merge topic 'fix-ios-install'Brad King2015-09-018-6/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad262917 Xcode: Add unit test for iOS project install (#12506) 48fe617e Fix installation of iOS targets (#12506) d2c2319d Replace CMAKE_XCODE_EFFECTIVE_PLATFORMS with call to PlatformIsAppleIos
| * | | | | | | Xcode: Add unit test for iOS project install (#12506)Gregor Jasny2015-08-264-0/+29
| | | | | | | |
| * | | | | | | Fix installation of iOS targets (#12506)Gregor Jasny2015-08-252-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since cmTarget::ComputeOutputDir results can be used in CMake code of script cmake_install.cmake and in Xcode internals, string ${EFFECTIVE_PLATFORM_NAME} should be used instead of $(EFFECTIVE_PLATFORM_NAME) because it works for both. Value of CMAKE_CFG_INTDIR can't be used in BUILD_TYPE argument of install command since it contains $(EFFECTIVE_PLATFORM_NAME) (e.g. equals to `Release-iphoneos`, `Debug-iphoneos`, etc.).
| * | | | | | | Replace CMAKE_XCODE_EFFECTIVE_PLATFORMS with call to PlatformIsAppleIosGregor Jasny2015-08-253-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the CMAKE_XCODE_EFFECTIVE_PLATFORMS property acts only as a kind of toggle switch to enable iOS project layout features. But instead of relying on this undocumented property, better detect the presence of an iOS SDK directly.
* | | | | | | | Merge topic 'vs-store-phone-cert-thumbs'Brad King2015-09-011-7/+8
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | e0cf77b3 cmSystemTools: Use CreateFileW explicitly to pass wchar_t path
| * | | | | | | cmSystemTools: Use CreateFileW explicitly to pass wchar_t pathBrad King2015-08-311-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The call to CreateFile added by commit ac0bb433 (VS: Windows Store/Phone package cert thumbprint, 2015-08-21) passes a wide character path explicitly so we should call CreateFileW directly. Otherwise it does not build without -DUNICODE (e.g. in bootstrap on MSYS).
* | | | | | | | Merge topic 'update-kwsys'Brad King2015-09-016-94/+370
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 49d293a7 Merge branch 'upstream-kwsys' into update-kwsys ca96be22 KWSys 2015-08-24 (cdaf522c)
| * \ \ \ \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-08-316-94/+370
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | KWSys 2015-08-24 (cdaf522c)KWSys Robot2015-08-316-94/+370
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ cdaf522c | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' dad68c33..cdaf522c Brad King (2): c8e5d1b2 Pass C++ standard flags to SunPro in standalone build 91cb7820 Remove unused source file "CMakeEmptyInputFile.in" James Johnston (6): 0bca555e Process: Test running a process many times to discover resource leaks 52788bb8 SystemTools: Remove trailing whitespace. 8122214c cmake: Set CMAKE_LEGACY_CYGWIN_WIN32 to 0. 389d416b SystemTools: Clarify/simplify behavior of FileExists 8970cd56 SystemTools: Added new TestFileAccess function. cdaf522c SystemTools: Add honor_umask parameter to SetPermissions. Mattias Ellert (1): b9df3e48 Fix implementation of KWSYS_PROPERTIES_C
* | | | | | | | Merge topic 'add-link-search-static-properties-defaults'Brad King2015-09-011-5/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 9e21b01a Revert LINK_SEARCH_{START,END}_STATIC behavior change
| * | | | | | | Revert LINK_SEARCH_{START,END}_STATIC behavior changeBrad King2015-08-311-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes to cmComputeLinkInformation.cxx in commit 675ef165 (Allow LINK_SEARCH_{START,END}_STATIC props to have default values, 2015-08-07) are unrelated to the feature added by that change and are incorrect. They lead to cases of extra -Bdynamic flags. Revert them.
* | | | | | | | CMake Nightly Date StampKitware Robot2015-09-011-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'makefile-color-when-needed'Brad King2015-08-311-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfb9d34f Makefile: Print color escapes only when necessary
| * | | | | | | Makefile: Print color escapes only when necessaryBrad King2015-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach cmSystemTools::MakefileColorEcho to use the color printing API only when we actually have a color to print. This avoids printing escape sequences that do not change the text attributes. Since commit v3.3.0-rc1~480^2~4 (Makefile: Fix output during parallel builds, 2015-02-05) we always use this code path to print progress and rule messages even when color is disabled (e.g. in a try_compile). It is important to avoid printing escapes when there is no color because on MSYS we have no isatty and so assume that vt100 escapes are supported, but we do not want to print them when capturing try_compile output. If we capture the vt100 escapes in try_compile output, they contain unbalanced square brackets. This causes CMakeParseImplicitLinkInfo to fail to separate lines in a ;-list and therefore fail to extract information from the link line. Then mixed-language linking breaks.
* | | | | | | | Merge topic 'vs-store-phone-cert-thumbs'Brad King2015-08-316-15/+111
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ac0bb433 VS: Windows Store/Phone package cert thumbprint 92b835ec Simplify condition for using rpcrt4 library on Windows
| * | | | | | | VS: Windows Store/Phone package cert thumbprintGilles Khouzam2015-08-275-2/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the PackageCertificateThumbprint property when there is a certificate on a WindowsStore or Phone app.
| * | | | | | | Simplify condition for using rpcrt4 library on WindowsBrad King2015-08-272-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the CMAKE_BUILD_ON_VISUAL_STUDIO variable and hard-code the condition at its only use.
* | | | | | | | Merge topic 'fix-ctest-xml-double-encoding'Brad King2015-08-318-20/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab2524d6 CTest: Fix XML double-encoding cases dee84dc7 cmCTest{BZR,GIT,P4}: Remove unused cmXMLSafe includes b3372db5 cmExtra{Kate,SublimeText}Generator: Remove unused cmXMLSafe includes