summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-genex-CONFIG' into releaseBrad King2012-11-064-1/+14
|\
| * GenEx: Use case insensitive comparison for $<CONFIG:...>Stephen Kelly2012-11-054-1/+14
| | | | | | | | | | This fixes a regression introduced by commit f1eacf0e (cmGeneratorExpression: Re-write for multi-stage evaluation).
* | Merge branch 'copyright-year' into releaseBrad King2012-11-062-2/+2
|\ \
| * | Update programmatically-reported copyright year (#13638)Brad King2012-11-052-2/+2
| |/ | | | | | | | | Update the copyright year reported by 'bootstrap' and in the generated documentation to report 2012.
* | Merge branch 'fix-PathScale-compiler-id' into releaseBrad King2012-11-062-16/+16
|\ \
| * | Fix PathScale compiler id for Clang-based upstreamBrad King2012-11-052-16/+16
| |/ | | | | | | | | | | | | Upstream PathScale now uses Clang as its front-end. Test for __PATHCC__ before __clang__. Reported-by: C. Bergström <cbergstrom@pathscale.com>
* | Merge branch 'fix-openssl-win' into releaseBrad King2012-11-061-0/+7
|\ \
| * | FindOpenSSL: also find the non-MD debug libraries for MSVCRolf Eike Beer2012-11-051-0/+2
| | | | | | | | | | | | We already search for them in release mode.
| * | FindOpenSSL: fix library selection on Windows (#13645)Rolf Eike Beer2012-11-051-0/+5
| |/
* | Merge branch 'pdb-default-outdir' into releaseBrad King2012-11-062-5/+8
|\ \
| * | Fix default PDB output directory (#13644)Brad King2012-11-022-5/+8
| |/ | | | | | | | | | | | | | | | | The ComputePDBOutputDir added by commit 3f60dbf1 (Add PDB_OUTPUT_DIRECTORY and PDB_NAME target properties, 2012-09-25) falls back to the current binary directory instead of the target output directory as before. When no PDB_OUTPUT_DIRECTORY property is set we instead should fall back to the target output directory where .pdb files used to go before the new property was added.
* | CMake 2.8.10v2.8.10David Cole2012-10-312-1/+5
|/
* Merge branch 'release'David Cole2012-10-312-3/+443
|\
| * CMake 2.8.10-rc3David Cole2012-10-242-1/+17
| |
| * Merge branch 'release'David Cole2012-10-242-3/+427
| |\
| | * CMake 2.8.10-rc2David Cole2012-10-182-1/+67
| | |
| | * Merge branch 'release'David Cole2012-10-182-3/+361
| | |\
| | | * CMake 2.8.10-rc1David Cole2012-10-022-3/+361
| | | |
* | | | CMake Nightly Date StampKitware Robot2012-10-311-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2012-10-301-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2012-10-291-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2012-10-281-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2012-10-271-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2012-10-261-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2012-10-251-1/+1
|/ / /
* | | CMake Nightly Date StampKitware Robot2012-10-241-1/+1
| | |
* | | Merge topic 'genex-validate-target-property-names'David Cole2012-10-237-6/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e386992 GexEx: Validate Target names and property names differently. 95d590d GenEx: Create cmGeneratorTargets for imported targets. 0442104 GenEx: Add an accessor for imported targets in a makefile.
| * | | GexEx: Validate Target names and property names differently.Stephen Kelly2012-10-223-6/+23
| | | | | | | | | | | | | | | | | | | | In the unit test, use the same IMPORTED_LOCATION trick that the ExportImport test uses.
| * | | GenEx: Create cmGeneratorTargets for imported targets.Stephen Kelly2012-10-223-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're going to need to link to them, and all the linking API is moving to cmGeneratorTarget. Skip imported targets when iterating over cmGeneratorTargets in places where we only want targets we build. The GetGeneratorTargets result now includes IMPORTED targets where it didn't before. The GetTargets result, which was what used to be called in these methods does not include IMPORTED targets. This doesn't relate to any known bugs, but in some future uses of GetGeneratorTargets it will be important, so starting the convention and being deliberate now is a good idea.
| * | | GenEx: Add an accessor for imported targets in a makefile.Stephen Kelly2012-10-221-0/+4
| | | |
* | | | Merge topic 'expand-LOCATION-documentation'David Cole2012-10-231-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 0cc00b0 Document LOCATION undefined behavior with use of LINKER_LANGUAGE.
| * | | | Document LOCATION undefined behavior with use of LINKER_LANGUAGE.Stephen Kelly2012-10-221-2/+2
| |/ / /
* | | | Merge topic 'test-SelectLibraryConfigurations'David Cole2012-10-233-5/+75
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | a22f4fa SelectLibraryConfigurations: fix for release and debug libs being the same 5052fbc SelectLibraryConfigurations: add testcase
| * | | | SelectLibraryConfigurations: fix for release and debug libs being the sameRolf Eike Beer2012-10-212-5/+13
| | | | |
| * | | | SelectLibraryConfigurations: add testcaseRolf Eike Beer2012-10-212-0/+62
| | | | |
* | | | | Merge topic 'fix-SelectLibraryConfigurations-regression'David Cole2012-10-231-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1cd2ec1 SelectLibraryConfigurations: Fix foreach(x IN LISTS ...) syntax
| * | | | | SelectLibraryConfigurations: Fix foreach(x IN LISTS ...) syntaxThomas Arcila2012-10-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 5797512c (SelectLibraryConfiguration: generate correct output when input vars are lists, 2012-07-28) the "IN" keyword was left out.
* | | | | | Merge topic 'BasicConfigVersion-consistency'David Cole2012-10-232-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc0b0f6 BasicConfigVersion: Make docs refer to the macro, not the module name
| * | | | | | BasicConfigVersion: Make docs refer to the macro, not the module nameStephen Kelly2012-10-232-2/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | The -ExactVersion variant already refers to the macro, and I think it makes more sense anyway.
* | | | | | CMake Nightly Date StampKitware Robot2012-10-231-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2012-10-221-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2012-10-211-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2012-10-201-1/+1
| |_|/ / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2012-10-191-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2012-10-181-1/+1
|/ / /
* | | Merge topic 'refactor-CTestUseLaunchers'David Cole2012-10-172-12/+51
|\ \ \ | | | | | | | | | | | | | | | | d63eb0b CTest: Ensure CTEST_USE_LAUNCHERS behaves nicely in Superbuild setup
| * | | CTest: Ensure CTEST_USE_LAUNCHERS behaves nicely in Superbuild setupJean-Christophe Fillion-Robin2012-10-162-12/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building a project relying on External projects, the launchers were not used in subprojects built without testing enabled. This was preventing errors and warnings associated with these subprojects from being reported on the dashboard. This commit allows enabling the launchers independently of the value of "BUILD_TESTING" using one of these two approaches: 1) By setting both CTEST_USE_LAUNCHERS and the env variable "CTEST_USE_LAUNCHERS_DEFAULT" to 1 in the ctest dashboard driver scripts. 2) By enabling the variable CTEST_USE_LAUNCHERS in the ctest dashboard driver script and also by ensuring every external project passes the option -DCMAKE_PROJECT_<projectname>_INCLUDE:FILEPATH=${CMAKE_ROOT}/Modules/CTestUseLaunchers.cmake
* | | | Merge topic 'fix-INCLUDE_DIRECTORIES-multiconfig'David Cole2012-10-1717-58/+92
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2a6bd96 Fix config-specific INCLUDE_DIRECTORIES in multi-config generators
| * | | | Fix config-specific INCLUDE_DIRECTORIES in multi-config generatorsStephen Kelly2012-10-1717-58/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 08cb4fa4 (Process generator expressions in the INCLUDE_DIRECTORIES property, 2012-09-18) contained an incorrect assumption that CMAKE_BUILD_TYPE was set on the makefile for each generated configuration in multi-config generators. Fix that by making the GetIncludeDirectories API depend on the config.
* | | | | Merge topic 'generator-expression-bug-fixes'David Cole2012-10-1717-23/+225
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79edd00 GenEx: Fix reporting about not-found include directories and libraries. f7ef32b GenEx: Replace some failing tests with Borland and NMake makefiles. fd59b10 GenEx: Add some more asserts to verify code-sanity. 6dd2b36 GenEx: Break if there are no more commas in the container e7230c7 GenEx: Fix termination bugs in generator expression parser. 145a4af GenEx: Test the use of generator expressions to generate lists. e2d141d GenEx: Parse colon after arguments separator colon specially.