summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Simplify condition for using rpcrt4 library on WindowsBrad King2015-08-271-2/+2
| | | | | Drop the CMAKE_BUILD_ON_VISUAL_STUDIO variable and hard-code the condition at its only use.
* Merge topic 'cmState-definitions'Brad King2015-08-245-125/+185
|\ | | | | | | | | | | | | | | | | | | bff27391 cmState: Host variable definitions. 6954c893 cmState: Add a VariableScope snapshot type. 1fc645bd cmState: Add a Base snapshot type. 0f070dd3 cmMakefile: Decouple the container of cmDefinitions from scoping logic. 25e04ddf cmDefinitions: Implement in terms of cmLinkedTree. 4bbe261c cmMakefile: Extract InitializeVarScope method.
| * cmState: Host variable definitions.Stephen Kelly2015-08-233-148/+126
| |
| * cmState: Add a VariableScope snapshot type.Stephen Kelly2015-08-233-1/+38
| | | | | | | | Match the scopes currently used in cmMakefile for definitions.
| * cmState: Add a Base snapshot type.Stephen Kelly2015-08-232-2/+4
| | | | | | | | For completeness mostly.
| * cmMakefile: Decouple the container of cmDefinitions from scoping logic.Stephen Kelly2015-08-231-24/+56
| | | | | | | | Maintain a Parent tree node for writing to in RaiseScope.
| * cmDefinitions: Implement in terms of cmLinkedTree.Stephen Kelly2015-08-233-33/+39
| | | | | | | | | | | | | | Store the definitions in a cmLinkedTree in the cmMakefile. This can be moved to cmState and then the tree will provide snapshotting possibilities. It will also make the Closure copy created at the start of each cmMakefile unnecesarry.
| * cmMakefile: Extract InitializeVarScope method.Stephen Kelly2015-08-231-1/+6
| |
* | Merge topic 'ios-app-bundle-layout'Brad King2015-08-243-10/+35
|\ \ | | | | | | | | | | | | 744e6c49 Fix iOS Bundle layouts (#15669)
| * | Fix iOS Bundle layouts (#15669)Gregor Jasny2015-08-243-10/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In contrast to Mac OS X App bundle layout the iOS one lacks the Contents/MacOSX structure. See also the Bundle Structures documentation in Mac Developer Library: https://developer.apple.com/library/mac/documentation/CoreFoundation/Conceptual/CFBundles/BundleTypes/BundleTypes.html For now detect iOS targets by checking the SDK name/path.
* | | Merge topic 'remove-unused-cmPolicies'Brad King2015-08-242-4/+0
|\ \ \ | | | | | | | | | | | | | | | | d8a57148 cmake: Remove unused cmPolicies member.
| * | | cmake: Remove unused cmPolicies member.Stephen Kelly2015-08-232-4/+0
| | |/ | |/| | | | | | | | | | | | | heaptrack showed a 1 byte allocation with the backtrace pointing here, as is the case since commit v3.3.0-rc1~112^2~5 (cmPolicies: Remove unused cmPolicy class., 2015-05-03)
* | | Merge topic 'refactor-progress'Brad King2015-08-247-50/+71
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3fa1b964 cmGlobalUnixMakefileGenerator3: Change the progress container key. 55e39276 cmState: Make it possible to order cmState::Snapshot. 04168cbb cmGlobalUnixMakefileGenerator3: Rename member. 2394584c cmGlobalGenerator: Rename progress initializer method. b9eb3cd1 cmGlobalGenerator: Move LG to target map to subclass. f5d2b7a6 cmGlobalGenerator: Remove clearance of map.
| * | | cmGlobalUnixMakefileGenerator3: Change the progress container key.Stephen Kelly2015-08-232-4/+5
| | | |
| * | | cmState: Make it possible to order cmState::Snapshot.Stephen Kelly2015-08-233-0/+20
| | | |
| * | | cmGlobalUnixMakefileGenerator3: Rename member.Stephen Kelly2015-08-232-4/+4
| | | |
| * | | cmGlobalGenerator: Rename progress initializer method.Stephen Kelly2015-08-234-4/+4
| | | |
| * | | cmGlobalGenerator: Move LG to target map to subclass.Stephen Kelly2015-08-234-47/+48
| | | | | | | | | | | | | | | | This is the only user.
| * | | cmGlobalGenerator: Remove clearance of map.Stephen Kelly2015-08-231-1/+0
| |/ / | | | | | | | | | It is always cleared before being re-populated.
* | | Merge topic 'generators-use-cmLocalGenerator'Brad King2015-08-2411-28/+53
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1f39ee5b cmInstallExportGenerator: Require cmLocalGenerator, not cmMakefile. c259b830 cmTestGenerator: Require cmLocalGenerator, not cmMakefile. 75e511ee cmInstallFilesGenerator: Require cmLocalGenerator, not cmMakefile.
| * | | cmInstallExportGenerator: Require cmLocalGenerator, not cmMakefile.Stephen Kelly2015-08-234-10/+17
| | | |
| * | | cmTestGenerator: Require cmLocalGenerator, not cmMakefile.Stephen Kelly2015-08-233-5/+19
| | | |
| * | | cmInstallFilesGenerator: Require cmLocalGenerator, not cmMakefile.Stephen Kelly2015-08-235-13/+17
| |/ /
* | | Merge topic 'fix-include_directories-BEFORE'Brad King2015-08-241-6/+5
|\ \ \ | | | | | | | | | | | | | | | | a4bd3010 include_directories: Fix regression in BEFORE option (#15693)
| * | | include_directories: Fix regression in BEFORE option (#15693)Brad King2015-08-211-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 6ed9c7e0 (cmState: Host buildsystem properties for directories, 2015-07-18) broke include_directories(BEFORE). Fix it and add a test case.
* | | | CMake Nightly Date StampKitware Robot2015-08-241-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-08-231-1/+1
| |/ / |/| |
* | | CMake Nightly Date StampKitware Robot2015-08-221-1/+1
|/ /
* | Merge topic 'modules-no-soname'Brad King2015-08-211-2/+1
|\ \ | | | | | | | | | | | | | | | f799ffb5 Do not set SONAME for MODULE library targets (#15705) 899458ab Tests: Cover NO_SONAME property for SHARED libraries
| * | Do not set SONAME for MODULE library targets (#15705)Felix Geyer2015-08-201-2/+1
| | | | | | | | | | | | | | | The SONAME field is only useful for shared libraries that application link against.
* | | Merge topic 'OUTPUT_NAME-genex-no-recursion'Brad King2015-08-212-35/+62
|\ \ \ | | | | | | | | | | | | | | | | 3c37d264 cmGeneratorTarget: Avoid recursion in GetOutputName method
| * | | cmGeneratorTarget: Avoid recursion in GetOutputName methodRobert Goulet2015-08-202-35/+62
| | | | | | | | | | | | | | | | | | | | | | | | Since support for generator expressions was added to OUTPUT_NAME it is possible for project code to cause recursion in this method by using a $<TARGET_FILE> genex. Detect and reject such cases.
* | | | Merge topic 'vs-fix-obj-extension'Brad King2015-08-211-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3e94f94b cmLocalVisualStudioGenerator: Use computed .obj extension (#13685)
| * | | | cmLocalVisualStudioGenerator: Use computed .obj extension (#13685)Bastien Schatt2015-08-181-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | CMAKE_<LANG>_OUTPUT_EXTENSION tells us the proper extension for the current toolchain. Teach the ComputeObjectFilenames method to use GetLanguageOutputExtension to look up the extension instead of hard-coding ".obj". This is already done in the code path for explicit file names inside our call to GetObjectFileNameWithoutTarget.
* | | | Merge topic 'get-filename-component-base-dir'Brad King2015-08-211-4/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e89ea3d1 get_filename_component: Teach new BASE_DIR parameter.
| * | | | get_filename_component: Teach new BASE_DIR parameter.James Johnston2015-08-181-4/+16
| | |/ / | |/| | | | | | | | | | | | | | | | | | In the get_filename_component command, add a new BASE_DIR parameter to use with the ABSOLUTE and REALPATH options. This will be used when finding an absolute path from a relative path.
* | | | CMake Nightly Date StampKitware Robot2015-08-211-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2015-08-201-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2015-08-191-1/+1
| |/ |/|
* | Merge topic 'cmake-gui-high-resolution'Brad King2015-08-181-0/+2
|\ \ | | | | | | | | | | | | a41ebd4e cmake-gui: Add support for HiDPI (Retina) screens on OS X
| * | cmake-gui: Add support for HiDPI (Retina) screens on OS XFrancois Best2015-08-171-0/+2
| | |
* | | Merge topic 'build-subdir'Brad King2015-08-181-0/+19
|\ \ \ | | | | | | | | | | | | | | | | ba1065ab cmake: Add support for "--build ." in subdirectory (#15696)
| * | | cmake: Add support for "--build ." in subdirectory (#15696)Clinton Stimpson2015-08-151-0/+19
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-08-181-1/+1
| |_|/ |/| |
* | | Merge topic 'propagate-link-search-to-try_compile'Brad King2015-08-171-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | 7f0b83e0 try_compile: Update documentation for other propagated variables fb77c2c5 try_compile: Propogate the CMAKE_LINK_SEARCH_ variables
| * | | try_compile: Propogate the CMAKE_LINK_SEARCH_ variablesChuck Atkins2015-08-141-0/+10
| |/ /
* | | Merge topic 'extended-length-paths'Brad King2015-08-171-8/+11
|\ \ \ | | | | | | | | | | | | | | | | e06ea837 cmSystemTools: Use extended length paths for Windows apis.
| * | | cmSystemTools: Use extended length paths for Windows apis.Clinton Stimpson2015-08-151-8/+11
| |/ /
* | | Merge topic 'update-curl'Brad King2015-08-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4071a747 curl: Update README-CMake.txt for new snapshot 7727d485 curl: Update configuration of build within CMake 3f2f1a94 curl: Fix check for gethostbyname_r with 5 arguments 91e8d35a Merge branch 'curl-upstream' into update-curl 602cdc06 cmCurl: Tolerate lack of CURLOPT_CAPATH support 70654261 curl 7.44.0 (reduced)
| * | | cmCurl: Tolerate lack of CURLOPT_CAPATH supportBrad King2015-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since curl 7.39 the CURLOPT_CAPATH setting may be rejected with a CURLE_NOT_BUILT_IN error. Simply tolerate this with silent failure since we just will not use the CAPATH setting in this case.