summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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)
| * | | | | | Revert "CTest: fix pre and post test commands with spaces" (#13887)Rolf Eike Beer2013-07-271-3/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6187876dea89618044e200808bcae75a18bd4043. It was actually possible before to have paths with spaces in them, the spaces just need to be quoted. This way spaces will work as argument separators.
* | | | | | Merge topic 'rpath-on-mac'Brad King2013-07-291-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84698ab OS X: If necessary, use xcrun to help find otool used to query install names.
| * | | | | | OS X: If necessary, use xcrun to help find otool used to query install names.Clinton Stimpson2013-07-271-1/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | This fixes querying for @rpath install names when using Xcode without the command line tools installed.
* | | | | | Merge topic 'DocumentGraphvisOptions'Brad King2013-07-291-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 692ecf4 graphvizoptions: add copyright notice ee32673 Add documentation for the --graphviz support
| * | | | | | Add documentation for the --graphviz supportAlex Neundorf2013-07-261-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds Modules/CMakeGraphVizOptions.cmake, which is used only for generating documentation for the --graphviz support. Alex
* | | | | | | Merge topic 'ninja_bad_cmcldeps_paths'Brad King2013-07-291-9/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9275554 Ninja: Update BuildDepends test to verify cmcldeps depfiles. 6fa9d0a Ninja: Make cmcldeps depfile output more consistent with 'ninja -t msvc'
| * | | | | | | Ninja: Make cmcldeps depfile output more consistent with 'ninja -t msvc'Reid Kleckner2013-07-261-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja relies on the generator to produce paths that match up with the paths used in the build.ninja file, which are spelled with backslashes. Therefore, cmcldeps should canonicalize depfile paths to use backslashes and relativize paths to the build directory.
* | | | | | | | Merge topic 'minor-cleanups'Brad King2013-07-297-27/+61
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b8dc7fa Genex: Disallow LINKER_LANGUAGE only when used on a static library. c8a10ba cmTarget: Fix iface libraries and languages for static libraries. f94bdb3 cmTarget: Remove duplicates when printing traces of tll signatures ff3d5fa Export: Fix typo of LINK_INTERFACE_LIBRARIES. 79a7a81 Docs: Document variables for default visibility values. 6f6391b Docs: Generalize and de-duplicate VISIBILITY_PREFIX docs. d8cb47f Docs: Trim trailing whitespace in generated doc. f10e648 Docs: Document existing target property debugging options. 4f4d69f Qt4Macros: Simplify some variable population. a413a40 Qt4Macros: Remove undefined varible use. b60a29e Qt4Macros: Remove unneeded generate CONDITION. e454cba Docs: Document file(GENERATE) CONDITION as optional.
| * | | | | | | Genex: Disallow LINKER_LANGUAGE only when used on a static library.Stephen Kelly2013-07-263-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For shared libraries and executables, the linker_language is indepenedent of the linked libraries.
| * | | | | | | cmTarget: Fix iface libraries and languages for static libraries.Stephen Kelly2013-07-261-1/+16
| | | | | | | |
| * | | | | | | cmTarget: Remove duplicates when printing traces of tll signaturesStephen Kelly2013-07-261-1/+7
| | | | | | | |
| * | | | | | | Export: Fix typo of LINK_INTERFACE_LIBRARIES.Stephen Kelly2013-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refer correctly to the old property, not the new one.
| * | | | | | | Docs: Document variables for default visibility values.Stephen Kelly2013-07-261-0/+16
| | | | | | | |