summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmake-gui-qt5-win'Brad King2013-08-082-5/+23
|\ | | | | | | | | 8120e13 cmake-gui: Fix build rules for Qt5 on Windows
| * cmake-gui: Fix build rules for Qt5 on WindowsBrad King2013-08-072-5/+23
| | | | | | | | | | Set policy CMP0020 to NEW to get WinMain from Qt. Fix the documentation custom command PATH for cmake-gui to find the Qt5 DLLs.
* | CMake Nightly Date StampKitware Robot2013-08-081-1/+1
|/
* 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.
* | Merge topic 'osx-no-command-line-tools'Brad King2013-08-073-0/+29
|\ \ | | | | | | | | | | | | 03ab170 OS X: Enable command-line build without tools in PATH
| * | OS X: Enable command-line build without tools in PATHBrad King2013-08-063-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach modules CMakeDetermineCompiler and CMakeUnixFindMake to ask Xcode where to find the compiler or make tools, using 'xcrun --find', if none is found in the PATH. Teach module Platform/Darwin to add the path to the SDK to CMAKE_SYSTEM_PREFIX_PATH so that find_* command look there. Also add the SDK /usr/include directory to the implicit include list in CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES to suppress explicit -I options for it.
* | | 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 'peheader'Brad King2013-08-062-7/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bd827f9 WIN: Use COFF file header header for architecture detection (#14083)
| * | | | WIN: Use COFF file header header for architecture detection (#14083)Patrick Gansterer2013-08-052-7/+29
| |/ / / | | | | | | | | | | | | | | | | Read the machine field from the COFF file header to get the exact target architecture for ARM and SHx on the Windows platform.
* | | | 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-0621-107/+83
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0519-60/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-056-29/+35
| | | | | | | | | | | | | | | | | | | | Move the code which sets CMAKE_VS_PLATFORM_NAME from cmGlobalVisualStudio8Generator to cmGlobalVisualStudio7Generator.
| * | | VS10: Do not set the TargetMachine when detecting the compilerPatrick Gansterer2013-08-052-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Microsoft linker is intelligent enough to detect the target machine type depending on the input files. This allows us to get the target architecture from the compiler instead of maintaining the mapping to the platform name.
| * | | VS6: Hardcode id_machine_6 for compiler detectionPatrick Gansterer2013-08-052-4/+3
| | | | | | | | | | | | | | | | | | | | id_machine6 is never set to an other value than x86. So it is safe to remove the replacements with "x86" directly.
* | | | Merge topic 'ALIAS-targets'Brad King2013-08-0689-18/+739
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 370bf55 Add the ALIAS target concept for libraries and executables.
| * | | | Add the ALIAS target concept for libraries and executables.Stephen Kelly2013-08-0289-18/+739
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| |_|/ / |/| | |
* | | | Merge topic 'osx-find-sdk-for-deployment-target'Brad King2013-08-052-9/+5
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | bf5a5bc bootstrap: Do not suppress CMAKE_OSX_SYSROOT if CFLAGS have -isysroot (#14324) 95f78e0 OS X: Search for SDK based on deployment target (#14324)
| * | bootstrap: Do not suppress CMAKE_OSX_SYSROOT if CFLAGS have -isysroot (#14324)Brad King2013-08-021-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit a1c032b9 (bootstrap: Suppress CMAKE_OSX_SYSROOT if CFLAGS have -isysroot, 2012-09-21). If MACOSX_DEPLOYMENT_TARGET is set then CMAKE_OSX_DEPLOYMENT_TARGET will be set and Darwin.cmake will complain if no CMAKE_OSX_SYSROOT is set. Just allow both -isysroot flags to appear. The one generated by CMAKE_OSX_SYSROOT appears after and overrides the one from CFLAGS/CXXFLAGS.
| * | OS X: Search for SDK based on deployment target (#14324)Brad King2013-08-021-1/+5
| |/ | | | | | | | | | | | | | | When available, use CMAKE_OSX_DEPLOYMENT_TARGET instead of the host OS X version to select the default SDK. This makes sense because one should use the SDK matching the deployment target. Suggested-by: John Ralls <jralls@ceridwen.us>
* | 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.
* | Merge topic 'FindGTK2-pango-libs'Brad King2013-08-021-1/+5
|\ \ | | | | | | | | | | | | 73ba4e5 FindGTK2: Detect pangoft2 and pangoxft libraries
| * | FindGTK2: Detect pangoft2 and pangoxft librariesDaniele E. Domenichelli2013-08-011-1/+5
| |/
* | CMake Nightly Date StampKitware Robot2013-08-021-1/+1
|/
* Merge topic 'INCLUDES-DESTINATION-no-config'Brad King2013-08-017-16/+78
|\ | | | | | | | | | | 80e652f Export: Process generator expressions from INCLUDES DESTINATION. 4355815 cmTarget: Add NAME property
| * Export: Process generator expressions from INCLUDES DESTINATION.Stephen Kelly2013-07-316-15/+54
| | | | | | | | 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 'FindGTK2-gmodule'Brad King2013-08-011-1/+3
|\ \ | | | | | | | | | | | | | | | 7ca5958 FindGTK2: Detect gmodule library 76c72b9 FindGTK2: gthread-2.0 folder does not exist
| * | FindGTK2: Detect gmodule libraryDaniele E. Domenichelli2013-07-311-0/+3
| | |
| * | FindGTK2: gthread-2.0 folder does not existDaniele E. Domenichelli2013-07-311-1/+0
| |/ | | | | | | Partially revert commit 508e8ca024e47baea342da85c7bbd014c7fd6c30
* | 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-014-3/+27
|\ \ | | | | | | | | | | | | c0b8682 Allow target commands to be invoked with no items (#14325).
| * | Allow target commands to be invoked with no items (#14325).Stephen Kelly2013-07-314-3/+27
| |/ | | | | | | | | | | | | | | Code such as target_include_directories(foo PRIVATE ${items}) should not work or break based on whether items is defined or not.