summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2012-11-301-1/+1
|
* CMake Nightly Date StampKitware Robot2012-11-291-1/+1
|
* Merge topic 'windows-ce'Brad King2012-11-2816-46/+377
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 3a1006e VS: Added "Deploy" at project configuration for WindowsCE targets 40c36c9 VS: Make DetermineCompilerId working with WinCE too 038df9e VS: Allow setting the name of the target platform 6fe4fcb VS: Add parser for WCE.VCPlatform.config to read WinCE platforms 2118a20 VS: Support setting correct subsystem and entry point for WinCE 6920fed VS: Change variable type of Name from const char* to string 102521b VS: Change variable type of ArchitectureId from const char* to string 332dc09 VS: Add static method to get the base of the registry d41d4d3 VS: Add CMAKE_VS_PLATFORM_NAME definition to cmMakefile 14861f8 VS: Remove TargetMachine for linker when checking compiler id
| * VS: Added "Deploy" at project configuration for WindowsCE targetsPatrick Gansterer2012-11-276-8/+17
| |
| * VS: Make DetermineCompilerId working with WinCE tooPatrick Gansterer2012-11-271-0/+6
| | | | | | | | | | | | Add a dummy mainCRTStartup() function, since the linker searches for it instead of main() and set the CMAKE_SYSTEM_* variables depending on the MSVC_C_ARCHITECTURE_ID and CMAKE_VS_WINCE_VERSION variables.
| * VS: Allow setting the name of the target platformPatrick Gansterer2012-11-273-0/+7
| | | | | | | | | | Since the name for a target platform is independent of its cpu architecture an additional option is required to set it correctly.
| * VS: Add parser for WCE.VCPlatform.config to read WinCE platformsPatrick Gansterer2012-11-277-24/+297
| | | | | | | | | | | | Parse the WCE.VCPlatform.config file, which contains the installed WindowsCE SDKs in XML format, and add possibility to generate Visual Studio generators for them.
| * VS: Support setting correct subsystem and entry point for WinCEPatrick Gansterer2012-11-263-3/+21
| | | | | | | | | | WinCE has only one SubSystem. So the WIN32_EXECUTABLE property must be handled via the EntryPointSymbol in the vcproj files.
| * VS: Change variable type of Name from const char* to stringPatrick Gansterer2012-11-261-2/+2
| |
| * VS: Change variable type of ArchitectureId from const char* to stringPatrick Gansterer2012-11-264-7/+6
| |
| * VS: Add static method to get the base of the registryPatrick Gansterer2012-11-262-2/+12
| |
| * VS: Add CMAKE_VS_PLATFORM_NAME definition to cmMakefilePatrick Gansterer2012-11-262-0/+9
| | | | | | | | | | | | When adding more platforms to the Visual Studio generators a simple regular expressing can not handle all cases anymore. This new define holds the name of the Visual Studio target platform.
* | CMake Nightly Date StampKitware Robot2012-11-281-1/+1
| |
* | Merge topic 'generator-expression-fixes'Brad King2012-11-273-4/+51
|\ \ | | | | | | | | | | | | | | | | | | b581be0 Genex: Don't segfault on $<FOO,> 07749e3 Genex: Ensure that $<0:...> has a parameter. ee96dc7 Genex: Extract a method to parse parameters.
| * | Genex: Don't segfault on $<FOO,>Stephen Kelly2012-11-271-1/+9
| | | | | | | | | | | | | | | | | | Treat the comma as part of the identifier here. It will later not resolve to a generator expression and the user gets a proper error message.
| * | Genex: Ensure that $<0:...> has a parameter.Stephen Kelly2012-11-271-0/+16
| | |
| * | Genex: Extract a method to parse parameters.Stephen Kelly2012-11-262-3/+26
| | |
* | | Merge topic 'fix-13611-source-group-issues'Brad King2012-11-271-4/+5
|\ \ \ | | | | | | | | | | | | | | | | 00e9680 CMake: source_group needs to check its own regex after its children (#13611)
| * | | CMake: source_group needs to check its own regex after its children (#13611)Clemens Heppner2012-11-231-4/+5
| | | | | | | | | | | | | | | | Otherwise, regexes that descend into sub-folders do not get grouped correctly.
* | | | Merge topic 'revert-use-generator-target'Brad King2012-11-2717-103/+97
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0bbae6f Revert "Move GetLinkInformation to cmGeneratorTarget" d5cf644 Split link information processing into two steps. d8a59ea Port cmGeneratorExpression to cmTarget from cmGeneratorTarget.
| * | | | Revert "Move GetLinkInformation to cmGeneratorTarget"Stephen Kelly2012-11-2113-92/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we can't move all linking related code from cmTarget, it makes sense to reverse the move in some cases. This reverts commit 4f5384e75c6a00d110d3fa3f555a3f6a4f31bb46.
| * | | | Split link information processing into two steps.Stephen Kelly2012-11-211-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | The first step can be ported to use the generator expression API, while the second can not. This is for compatibility with CMP0003.
| * | | | Port cmGeneratorExpression to cmTarget from cmGeneratorTarget.Stephen Kelly2012-11-205-9/+7
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following from the discussion here: http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/3615/focus=5170 (Re: Generator expressisons in target properties, 26 Oct 12:10) we can't split cmTarget API for linking into cmGeneratorTarget. In the future we will probably also need to move the include and compile definitions API back to cmTarget so that it can be used by export().
* | | | Merge topic 'fix-13392-nmake-empty-depends-problem'Brad King2012-11-271-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 7ae7d66 NMake: Fix problem with empty DEPENDS args (#13392) 078e35d NMake: Add a test to demonstrate EmptyDepends issue (#13392)
| * | | | NMake: Fix problem with empty DEPENDS args (#13392)David Cole2012-11-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add_custom_command can have empty DEPENDS arguments, which was triggering invalid makefile generation for the NMake Makefiles generator. We were mistakenly emitting the build directory appended with "/" plus the empty string... which was then translated to a string ending in \" in build.make... which nmake choked on. The solution is not to emit any dependency when the input DEPENDS is the empty string. Return early from GetRealDependency in this empty input case.
* | | | | Merge topic 'use-cmsys-auto_ptr'Brad King2012-11-278-23/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ddc0520 Always use the auto_ptr from cmsys.
| * | | | | Always use the auto_ptr from cmsys.Stephen Kelly2012-11-208-23/+12
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | This is for consistency throughout cmake. The cmsys version exists becaues uses of auto_ptr types as return types does not work with some implementations in ancient compilers.
* | | | | Merge topic 'ninja-encode-LINK_FLAGS'Brad King2012-11-271-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 12ab135 Ninja: encode LINK_FLAGS to handle bash variables
| * | | | | Ninja: encode LINK_FLAGS to handle bash variablesPeter Kümmel2012-11-201-0/+3
| |/ / / / | | | | | | | | | | | | | | | Bug 13560
* | | | | Merge topic 'cpack-nsis64-patches'Brad King2012-11-273-2/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ff730a CPack/NSIS: Add support for 64-bit NSIS (#13203) 51da766 CPack/NSIS: Fix compatibility issues with prerelease NSIS (#13202)
| * | | | | CPack/NSIS: Add support for 64-bit NSIS (#13203)David Golub2012-11-203-2/+25
| | | | | |
* | | | | | Merge topic 'fix-untar-infinite-loop'Brad King2012-11-271-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37c34d7 CMake: Fix infinite loop untarring corrupt tar file
| * | | | | | CMake: Fix infinite loop untarring corrupt tar fileDavid Cole2012-11-261-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggested-by: Robert Maynard <robert.maynard@kitware.com>
* | | | | | | CMake Nightly Date StampKitware Robot2012-11-271-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2012-11-261-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2012-11-251-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2012-11-241-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2012-11-231-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2012-11-221-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2012-11-211-1/+1
| |_|/ |/| |
* | | Merge topic 'FixAutomocRegression3'Brad King2012-11-201-0/+59
|\ \ \ | | | | | | | | | | | | | | | | d253657 Automoc: fix regression #13667, broken build in phonon
| * | | 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
| * | | Merge branch 'fix-genex-CONFIG' into releaseBrad King2012-11-061-1/+4
| |\ \ \
| * \ \ \ Merge branch 'copyright-year' into releaseBrad King2012-11-061-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'pdb-default-outdir' into releaseBrad King2012-11-062-5/+8
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'generator-factory'Brad King2012-11-2054-814/+495
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75ebebc VS: Remove platform specific generator files 8b62080 VS: Remove EnableLanguage from platform-specific generators 5bdf011 VS: Remove GetPlatformName from platform-specific generators 8d42ab4 VS: Fix ArchitectureId of Visual Studio 10 IA64 generator 6f439b3 VS: Remove AddPlatformDefinitions from platform-specific generators 5170a88 Make cmGlobalGenerator::GetDocumentation() a static function 04ff866 Allow a GeneratorFactory handling of more than one generator 984ebc3 Search generator in cmake::ExtraGenerators before in cmake::Generators 30a6950 Add cmGlobalGeneratorFactory::GetGenerators() e8f8414 Introduce the abstract class cmGlobalGeneratorFactory
| * | | | | | | VS: Remove platform specific generator filesPatrick Gansterer2012-11-1924-576/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the whole logic into the base class and the factory.
| * | | | | | | VS: Remove EnableLanguage from platform-specific generatorsPatrick Gansterer2012-11-195-32/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the logic into the base class to remove duplicated code.
| * | | | | | | VS: Remove GetPlatformName from platform-specific generatorsPatrick Gansterer2012-11-199-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the existing ArchitectureId to generate the PlatformName to reduce duplicated information in the classes.
| * | | | | | | VS: Fix ArchitectureId of Visual Studio 10 IA64 generatorPatrick Gansterer2012-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace "x64" with "Itanium" like at the VS 9 IA64 generator.