summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindSDL_...: Restore dropped search paths (#13819)Benjamin Eikel2012-12-305-5/+10
| | | | | Restore the search paths that were accidentally dropped by me in commit 9ed24c53. This was already fixed for FindSDL.cmake in commit 7cb51739.
* CMake 2.8.10.2v2.8.10.2Brad King2012-11-262-1/+15
|
* Merge branch 'fix-untar-infinite-loop' into releaseBrad King2012-11-261-2/+5
|\
| * CMake: Fix infinite loop untarring corrupt tar fileDavid Cole2012-11-261-2/+5
| | | | | | | | Suggested-by: Robert Maynard <robert.maynard@kitware.com>
* | Merge branch 'fix-FindGettext-result' into releaseBrad King2012-11-261-2/+0
|\ \
| * | FindGettext: fix overwriting result with empty variable (#13691)Rolf Eike Beer2012-11-261-2/+0
| |/ | | | | | | | | Remove stray line left by commit 656ab19b (FindGettext: remove code duplicating FPHSA checks, 2012-09-08).
* | Merge branch 'fix-IMPORTED-GLOBAL-reconfigure' into releaseBrad King2012-11-261-0/+1
|\ \
| * | Initialize IMPORTED GLOBAL targets on reconfigure (#13702)Brad King2012-11-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit ca39c5cd (Optionally allow IMPORTED targets to be globally visible, 2012-01-25) cmGlobalGenerator has a second member that tracks targets with global scope. We must initialize the new 'ImportedTargets' member wherever the old 'TotalTargets' member is initialized. Without this initialization the ImportedTargets member is left with dangling pointers during a same-process re-configuration.
* | | Merge branch 'FixAutomocRegression3' into releaseBrad King2012-11-261-0/+59
|\ \ \
| * | | Automoc: fix regression #13667, broken build in phononAlex Neundorf2012-11-201-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some systems, ${QT_INCLUDE_DIR} is reported by gcc as a builtin include search dir. Some projects use this information to extend CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES. In cmake 2.8.10 now the targets are queried for the include directories they use. When they return the result, the include dirs contained in CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES have been removed. In cmake 2.8.9 and below the INCLUDE_DIRECTORIES directory property was queried, where this had not been stripped. So, in those projects which modify the implicit include dirs variable, on systems where ${QT_INCLUDE_DIR} is reported by gcc, this directory, e.g. /usr/lib/include/qt/, was not given anymore to moc. This made moc not find required headers, so the build broke. Simply giving the full CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES to moc is no solution either, since moc can't handle some of the headers it finds then (https://bugreports.qt-project.org/browse/QTBUG-28045). So now cmake checks CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES, and if this contains ${QT_INCLUDE_DIR}, and the target reports that it uses ${QT_QTCORE_INCLUDE_DIR} but not ${QT_INCLUDE_DIR}, ${QT_INCLUDE_DIR} is added to the include dirs given to moc. Alex
* | | | CMake 2.8.10.1v2.8.10.1Brad King2012-11-062-1/+17
|/ / /
* | | 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
| | | | | | | |
generated by cgit v0.12 at 2025-02-01 10:45:45 (GMT)