summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| * | | | | | | CTest: Fix XML double-encoding casesDaniel Pfeifer2015-08-283-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove use of cmXMLSafe from CTest when generating content that is later handled by cmXMLWriter. This was broken by refactoring in the topic merged by commit v3.3.0-rc1~22 (Merge topic 'ctest-xml-refactor', 2015-05-28).
| * | | | | | | cmCTest{BZR,GIT,P4}: Remove unused cmXMLSafe includesDaniel Pfeifer2015-08-283-3/+0
| | | | | | | |
| * | | | | | | cmExtra{Kate,SublimeText}Generator: Remove unused cmXMLSafe includesDaniel Pfeifer2015-08-282-2/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'FindJNI-mips'Brad King2015-08-311-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90a22c3a FindJNI: Add mips64(el) mipsn32(el) support (#15714)
| * | | | | | | FindJNI: Add mips64(el) mipsn32(el) support (#15714)Yunqiang Su2015-08-281-1/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Submitted-by: Felix Geyer <fgeyer@debian.org>
* | | | | | | Merge topic 'cpack-config-generation-test'Brad King2015-08-316-0/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 674dc0b3 CPack generator independent tests
| * | | | | | | CPack generator independent testsRoman Donchenko2015-08-286-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPackConfig.cmake file generation from CMake test suite. Currently it contains only a simple test without special characters in variable value. Test is not part of RunCMake/CPack as those tests are expected to be run for a specified generator.
* | | | | | | | Merge topic 'refactor-compute'Brad King2015-08-315-10/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 616d8f02 cmGeneratorTarget: Rename method to match operation. ec56d244 cmGlobalGenerator: Process evaluation files after target depends. 1e5349a5 cmGlobalGenerator: Access makefile from makefiles container.
| * | | | | | | | cmGeneratorTarget: Rename method to match operation.Stephen Kelly2015-08-305-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The manifest is computed, not generated, according to current language used in cmake method naming.
| * | | | | | | | cmGlobalGenerator: Process evaluation files after target depends.Stephen Kelly2015-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to generate the files if computation aborts generation.
| * | | | | | | | cmGlobalGenerator: Access makefile from makefiles container.Stephen Kelly2015-08-291-2/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'generate-time-generators'Brad King2015-08-3150-247/+176
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2b9a25d7 cmGlobalGenerator: Create global targets directly after Configure. 3e08b4df cmMakefile: Skip Global targets for CMP0019 evaluation. 357bf469 cmGlobalGenerator: Fill the project map at compute time. ebf8d0a9 cmGlobalGenerator: Rename method. bd096d30 cmGlobalGenerator: Avoid cmLocalGenerator until after Configure. ff8ac8ee cmLocalGenerator: Create from already-constructed cmMakefile. 0bd7279f Ninja: Remove some incorrect comments adding no value. 2f2d4da9 cmCTestScriptHandler: Simplify deletes. 7fdc9a8b QtAutogen: Use a smart pointer. 92041eec cmGlobalGenerator: Remove MakeLocalGenerator method. acb00622 cmGlobalGenerator: Require a snapshot to create a local generator. 83b8a927 cmMakefile: Remove cmLocalGenerator member. 9b6a743b cmLocalGenerator: Remove Parent pointer.
| * | | | | | | | cmGlobalGenerator: Create global targets directly after Configure.Stephen Kelly2015-08-281-19/+16
| | | | | | | | |
| * | | | | | | | cmMakefile: Skip Global targets for CMP0019 evaluation.Stephen Kelly2015-08-281-1/+2
| | | | | | | | |
| * | | | | | | | cmGlobalGenerator: Fill the project map at compute time.Stephen Kelly2015-08-281-4/+4
| | | | | | | | |
| * | | | | | | | cmGlobalGenerator: Rename method.Stephen Kelly2015-08-282-3/+3
| | | | | | | | |
| * | | | | | | | cmGlobalGenerator: Avoid cmLocalGenerator until after Configure.Stephen Kelly2015-08-281-4/+4
| | | | | | | | |
| * | | | | | | | cmLocalGenerator: Create from already-constructed cmMakefile.Stephen Kelly2015-08-2849-116/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't manage the lifetime of the cmMakefile with cmLocalGenerator.
| * | | | | | | | Ninja: Remove some incorrect comments adding no value.Stephen Kelly2015-08-281-11/+0
| | | | | | | | |
| * | | | | | | | cmCTestScriptHandler: Simplify deletes.Stephen Kelly2015-08-281-26/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleting a nullptr is fine.
| * | | | | | | | QtAutogen: Use a smart pointer.Stephen Kelly2015-08-281-2/+1
| | | | | | | | |
| * | | | | | | | cmGlobalGenerator: Remove MakeLocalGenerator method.Stephen Kelly2015-08-2814-27/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inline implementation to callers.
| * | | | | | | | cmGlobalGenerator: Require a snapshot to create a local generator.Stephen Kelly2015-08-2812-20/+31
| | | | | | | | |
| * | | | | | | | cmMakefile: Remove cmLocalGenerator member.Stephen Kelly2015-08-283-9/+10
| | | | | | | | |
| * | | | | | | | cmLocalGenerator: Remove Parent pointer.Stephen Kelly2015-08-2839-88/+49
| |/ / / / / / /
* | | | | | | | Merge topic 'GenerateExportHeader-cygwin-dllexport'Brad King2015-08-312-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e2865b4 GenerateExportHeader: Use dllexport/dllimport on Cygwin
| * | | | | | | | GenerateExportHeader: Use dllexport/dllimport on CygwinTony Kelman2015-08-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cygwin sits on top of Windows and so can use explicit symbol export and import markup too. Co-Author: Yaakov Selkowitz <yselkowitz@cygwin.com>
* | | | | | | | | CMake Nightly Date StampKitware Robot2015-08-311-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2015-08-301-1/+1
| | | | | | | | |