summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'optimize-custom-command-dependencies'Brad King2013-08-074-15/+76
|\ | | | | | | | | | | 2268c41 Optimize custom command full-path dependency lookup eccb39d VS 6,7: Refactor local generators to avoid GetSourceFileWithOutput
| * Optimize custom command full-path dependency lookupNicolas Despres2013-08-062-1/+65
| | | | | | | | | | | | | | | | In the common case of custom command dependencies specified via full path optimize the implementation of GetSourceFileWithOutput using a (hash) map. This is significantly faster than the existing linear search. In the non-full-path case fall back to the existing linear suffix search.
| * VS 6,7: Refactor local generators to avoid GetSourceFileWithOutputBrad King2013-08-062-14/+11
| | | | | | | | | | | | Use the cmSourceFile returned by AddCustomCommandToOutput instead of throwing out the return value and looking it up with GetSourceFileWithOutput.
* | CMake Nightly Date StampKitware Robot2013-08-071-1/+1
| |
* | Merge topic 'wince-entrypoint'Brad King2013-08-064-16/+19
|\ \ | | | | | | | | | | | | | | | 34969cf Fix setting of the entry point symbol for Windows CE (#14088) 5e0252c Improve const-correctness in cmVisualStudioGeneratorOptions
| * | Fix setting of the entry point symbol for Windows CE (#14088)Patrick Gansterer2013-08-052-10/+13
| | | | | | | | | | | | | | | Set the EntryPointSymbol only when it has not been set before and use the correct symbol depending on the usage of Unicode.
| * | Improve const-correctness in cmVisualStudioGeneratorOptionsPatrick Gansterer2013-08-052-6/+6
| | | | | | | | | | | | Add const qualifier to IsDebug(), UsingSBCS() and UsingUnicode().
* | | Merge topic 'vs-masm'Brad King2013-08-063-12/+50
|\ \ \ | | | | | | | | | | | | | | | | 28e770c VS10: Add support for assembler code (#11536)
| * | | VS10: Add support for assembler code (#11536)Patrick Gansterer2013-08-053-12/+50
| |/ / | | | | | | | | | | | | Use the masm BuildCustomizations, which are part of the Visual Studio installation to allow compilation of asm files.
* | | Merge topic 'vs-cleanup'Brad King2013-08-0617-79/+67
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | c90151b VS: Unify how the name of the generator is specified 3873d29 Fix detection of WinCE SDKs with 64bit verion of CMake 40a4302 VS12: Remove duplicated overload of UseFolderProperty() b02f09d VS: Replace ArchitectureId with PlatformName 4b15dc8 VS: Set CMAKE_VS_PLATFORM_NAME for VS7 and VS71 too 60e568c VS10: Do not set the TargetMachine when detecting the compiler dfbfe6f VS6: Hardcode id_machine_6 for compiler detection
| * | VS: Unify how the name of the generator is specifiedPatrick Gansterer2013-08-053-9/+9
| | | | | | | | | | | | | | | Use the value of the provided argument instead of using a fixed character buffer. This aligns VS10+VS11+VS12 with VS8+VS9.
| * | Fix detection of WinCE SDKs with 64bit verion of CMakePatrick Gansterer2013-08-051-2/+6
| | | | | | | | | | | | | | | Use cmSystemTools::KeyWOW64_32 instead of KeyWOW64_Default to make sure that the correct part of the registry is read.
| * | VS12: Remove duplicated overload of UseFolderProperty()Patrick Gansterer2013-08-052-10/+0
| | | | | | | | | | | | | | | cmGlobalVisualStudio11Generator generator already defines the same function body, which makes the additional overload useless.
| * | VS: Replace ArchitectureId with PlatformNamePatrick Gansterer2013-08-0516-47/+32
| | | | | | | | | | | | | | | | | | | | | | | | Since we do not need the information about the target architecture we can use the PlatformName only to specify the this information. This also removes setting of the MSVC_*_ARCHITECTURE_ID variable which is not required, because this variable gets set by the compiler detection code in CMAKE_DETERMINE_COMPILER_ID_CHECK().
| * | VS: Set CMAKE_VS_PLATFORM_NAME for VS7 and VS71 tooPatrick Gansterer2013-08-055-26/+35
| |/ | | | | | | | | Move the code which sets CMAKE_VS_PLATFORM_NAME from cmGlobalVisualStudio8Generator to cmGlobalVisualStudio7Generator.
* | Merge topic 'ALIAS-targets'Brad King2013-08-0619-15/+353
|\ \ | | | | | | | | | | | | 370bf55 Add the ALIAS target concept for libraries and executables.
| * | Add the ALIAS target concept for libraries and executables.Stephen Kelly2013-08-0219-15/+353
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The ALIAS name must match a validity regex. * Executables and libraries may be aliased. * An ALIAS acts immutable. It can not be used as the lhs of target_link_libraries or other commands. * An ALIAS can be used with add_custom_command, add_custom_target, and add_test in the same way regular targets can. * The target of an ALIAS can be retrieved with the ALIASED_TARGET target property. * An ALIAS does not appear in the generated buildsystem. It is kept separate from cmMakefile::Targets for that reason. * A target may have multiple aliases. * An ALIAS target may not itself have an alias. * An IMPORTED target may not have an alias. * An ALIAS may not be exported or imported.
* | | CMake Nightly Date StampKitware Robot2013-08-061-1/+1
| |/ |/|
* | CMake Nightly Date StampKitware Robot2013-08-051-1/+1
| |
* | CMake Nightly Date StampKitware Robot2013-08-041-1/+1
| |
* | CMake Nightly Date StampKitware Robot2013-08-031-1/+1
| |
* | Merge topic 'vs10-include-dir-ampersand'Brad King2013-08-021-1/+1
|\ \ | | | | | | | | | | | | e7bcdf8 VS10: Escape include paths in XML project files (#14331)
| * | VS10: Escape include paths in XML project files (#14331)Brad King2013-08-011-1/+1
| |/ | | | | | | | | | | Fix generation of the AdditionalIncludeDirectories element content to escape for XML syntax. We already escape content of other elements, this one was simply missing by accident.
* | CMake Nightly Date StampKitware Robot2013-08-021-1/+1
|/
* Merge topic 'INCLUDES-DESTINATION-no-config'Brad King2013-08-012-4/+49
|\ | | | | | | | | | | 80e652f Export: Process generator expressions from INCLUDES DESTINATION. 4355815 cmTarget: Add NAME property
| * Export: Process generator expressions from INCLUDES DESTINATION.Stephen Kelly2013-07-311-3/+25
| | | | | | | | Configuration sensitive expressions are not permitted.
| * cmTarget: Add NAME propertyStephen Kelly2013-07-311-1/+24
| | | | | | | | | | In generator expression contexts, this can be used to determine the name of the head target in the evaluation.
* | Merge topic 'minor-cleanups'Brad King2013-08-011-2/+1
|\ \ | | | | | | | | | | | | 7429941 Docs: Fix typo in CMAKE_DEBUG_TARGET_PROPERTIES
| * | Docs: Fix typo in CMAKE_DEBUG_TARGET_PROPERTIESStephen Kelly2013-07-311-2/+1
| |/ | | | | | | | | Introduced in commit f10e6480 (Docs: Document existing target property debugging options., 2013-07-26)
* | Merge topic 'vs-subsystem-order'Brad King2013-08-011-2/+2
|\ \ | | | | | | | | | | | | b64e8f2 VS10: Honor user-specified /SUBSYSTEM: flag (#14326)
| * | VS10: Honor user-specified /SUBSYSTEM: flag (#14326)Brad King2013-07-311-2/+2
| |/ | | | | | | | | | | Use the WIN32_EXECUTABLE target property only to set the SubSystem build attribute default. When user-specified flags are later parsed they may then override it.
* | Merge topic 'target-command-allow-no-items'Brad King2013-08-011-3/+3
|\ \ | | | | | | | | | | | | c0b8682 Allow target commands to be invoked with no items (#14325).
| * | Allow target commands to be invoked with no items (#14325).Stephen Kelly2013-07-311-3/+3
| |/ | | | | | | | | | | | | | | Code such as target_include_directories(foo PRIVATE ${items}) should not work or break based on whether items is defined or not.
* | CMake Nightly Date StampKitware Robot2013-08-011-1/+1
|/
* Merge topic 'static_library_flags'Brad King2013-07-318-98/+158
|\ | | | | | | | | | | | | | | | | | | 33e6e0b VS6: Add handling of CMAKE_*_LINKER_FLAGS_<CONFIG> variables 152dfda Add additonal tests for the linker flags 20ed496 Add documentation for the missing CMAKE_*_LINKER_FLAGS_* variables 54f7019 Add CMAKE_STATIC_LINKER_FLAGS to CMakeCommonLanguageInclude 2a43c30 Add support for CMAKE_STATIC_LINKER_FLAGS 14bbf83 Unify the way the flags of a static library are read
| * VS6: Add handling of CMAKE_*_LINKER_FLAGS_<CONFIG> variablesPatrick Gansterer2013-07-311-6/+30
| | | | | | | | | | Read the content of the config specific linker flags in the Visual Studio 6 generator too.
| * Add documentation for the missing CMAKE_*_LINKER_FLAGS_* variablesPatrick Gansterer2013-07-311-0/+43
| | | | | | | | | | | | Add CMAKE_MODULE_LINKER_FLAGS_*, CMAKE_SHARED_LINKER_FLAGS_* and CMAKE_STATIC_LINKER_FLAGS_* to cmDocumentVariables.cxx with a similar documentation as CMAKE_EXE_LINKER_FLAGS_*.
| * Add support for CMAKE_STATIC_LINKER_FLAGSPatrick Gansterer2013-07-312-32/+40
| | | | | | | | | | Add the content of this variable to the target specific linker flags as we do with the other CMAKE_*_LINKER_FLAGS variables already.
| * Unify the way the flags of a static library are readPatrick Gansterer2013-07-316-60/+45
| | | | | | | | | | Introduce cmLocalGenerator::GetStaticLibraryFlags() to have a central function for getting the linker flags for a given target.
* | Merge topic '13582_configured_file_regeneration'Brad King2013-07-311-1/+5
|\ \ | | | | | | | | | | | | 8fbf39a cmMakefile: Do not track configured files known to be temporary
| * | cmMakefile: Do not track configured files known to be temporaryBrad King2013-07-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit ad502502 (cmMakefile: Track configured files so we can regenerate them, 2013-06-18) cmMakefile::ConfigureFile records the configured file as an output file generated by CMake. The intention is that for make and ninja we can re-run CMake when one of the files it generates goes missing. However, files configured temporarily in CMakeTmp directories by Check* modules do not live past the CMake invocation. Teach cmMakefile::ConfigureFile to skip tracking files with "CMakeTmp" in their path, just like cmCoreTryCompile::TryCompileCode does to avoid adding dependencies on temporary source files. In the future we will need a more general filter to avoid recording as CMake outputs any files that do not exist at the end of generation.
* | | Merge topic 'install-interface-includes'Brad King2013-07-311-7/+0
|\ \ \ | | | | | | | | | | | | | | | | 72d13ff install: Remove error condition using INCLUDES DESTINATION without EXPORT.
| * | | install: Remove error condition using INCLUDES DESTINATION without EXPORT.Stephen Kelly2013-07-291-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 650e61f8 (Add a convenient way to add the includes install dir to the INTERFACE., 2013-01-05) introduced an error case for using the install(TARGETS) command with specified INCLUDES DESTINATION, but no specified EXPORT set. It is convenient to use a variable to set the various destinations for different outputs (as KDE does), and some targets such as executables are installed but not exported. This was triggering the error case, but as it is a common case, remove the error.
* | | | Merge topic 'passthru'Brad King2013-07-313-5/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2b473d2 Add option to use stdout/stderr of original terminal in cmake --build
| * | | | Add option to use stdout/stderr of original terminal in cmake --buildPatrick Gansterer2013-07-293-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the original file handles to the native tool when using the --use-stderr option in the build command. This enables the usage of advanced terminal features like colored output.
* | | | | CMake Nightly Date StampKitware Robot2013-07-311-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2013-07-301-1/+1
| | | | |
* | | | | Merge topic 'fix-export-includes-crash'Brad King2013-07-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f868e47 Fix crash on export of target with empty INTERFACE_INCLUDE_DIRECTORIES.
| * | | | | Fix crash on export of target with empty INTERFACE_INCLUDE_DIRECTORIES.Stephen Kelly2013-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new feature of install(TARGETS ... INCLUDES DESTINATION) introduced in commit 650e61f8 (Add a convenient way to add the includes install dir to the INTERFACE., 2013-01-05) introduced this crash. If the new feature is used with a target which has no INTERFACE_INCLUDE_DIRECTORIES, a segfault occurred.
* | | | | | Merge topic 'memcheck_pre_post_args'Brad King2013-07-291-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | c0756b6 Revert "CTest: fix pre and post test commands with spaces" (#13887)