summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* OS X: Warn about known SDK breakage by Xcode 3.2.6Brad King2012-11-081-0/+17
| | | | | | | Xcode 3.2.6 is known to break the SDK Library/Frameworks layout. Detect and warn about this case to tell users to fix their system. Reported-by: Matthew Brett <matthew.brett@gmail.com>
* Merge branch 'osx-sysroot-cleanup' into releaseBrad King2012-11-061-0/+1
|\
| * OS X: Fix default CMAKE_OSX_SYSROOT with deployment targetBrad King2012-11-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | Since commit 43b74793 (OS X: Further improve default CMAKE_OSX_SYSROOT selection, 2012-09-21) we choose a default CMAKE_OSX_SYSROOT only when one is needed. However, the change forgot that we require a sysroot when a deployment target is requested. Teach Darwin.cmake to choose a default CMAKE_OSX_SYSROOT when CMAKE_OSX_DEPLOYMENT_TARGET is set. Reported-by: Matthew Brett <matthew.brett@gmail.com> Reported-by: Bradley Giesbrecht <pixilla@macports.org>
* | Merge branch 'fix-FindSDL-paths' into releaseBrad King2012-11-061-1/+2
|\ \
| * | FindSDL: Restore accidentally dropped search paths (#13651)Brad King2012-11-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup in commit 9ed24c53 (FindSDL: Remove from find_... calls PATHS that are set by default, 2012-09-04) accidentally dropped some search paths. Restore the dropped PATH_SUFFIXES and add more suffixes needed to search paths that were previously hard-coded. Reported-by: Gino van den Bergen <gino@dtecta.com>
* | | 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
|/ / / / /