kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
29,389 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

19165 Commits

Author SHA1 Message Date
Stephen Kelly b3f2299e06 cmState: Move ProjectName from cmMakefile. 2015-08-25 19:57:42 +02:00
Stephen Kelly 6ce940ac97 cmMakefile: Use std::string in ProjectName API. 2015-08-25 19:55:34 +02:00
Stephen Kelly e8c0341d86 cmMakefile: Out-of-line GetProjectName. 2015-08-25 19:55:32 +02:00
Kitware Robot a8f8848241 CMake Nightly Date Stamp 2015-08-25 00:01:07 -04:00
Stephen Kelly e876963fc9 Replace '0 == instances.size()' with instances.empty(). 
This is not a pattern.
 2015-08-24 20:47:18 +02:00
Stephen Kelly 44ffb9cdb4 Replace foo.size() pattern with !foo.empty(). 2015-08-24 20:47:18 +02:00
Stephen Kelly 8f89f8b1e9 Replace 'foo.size() != 0' pattern with !foo.empty(). 2015-08-24 20:47:17 +02:00
Stephen Kelly 524610f967 Replace 'foo.size() == 0' pattern with foo.empty(). 2015-08-24 20:47:17 +02:00
Stephen Kelly 0e14c7ee63 Replace 'foo.size() > 0' pattern with !foo.empty(). 2015-08-24 20:47:17 +02:00
Brad King ddb7f280ce Merge topic 'drop-cmsys-std-layer' 
04e708d8 Remove use of include <cmsys/IOStream.hxx> from KWSys
e8585f45 Remove use of include <cmsys/stl/*> and cmsys_stl::*
6db713c0 Remove use of include <cmsys/ios/*> and cmsys_ios::*
 2015-08-24 14:28:43 -04:00
Stephen Kelly 867b5be8b8 cmLocalGenerator: Remove unused Children member. 2015-08-24 20:05:38 +02:00
Stephen Kelly 6c832219ea cmLocalGenerator: Implement child traversal in terms of cmState. 2015-08-24 20:05:37 +02:00
Stephen Kelly 3fcf383763 Makefiles: Remove valueless cast. 2015-08-24 20:05:37 +02:00
Stephen Kelly 223f4a662f cmLocalGenerator: Simplify condition. 2015-08-24 20:05:37 +02:00
Stephen Kelly ae026f5458 cmState: Store Children states in parent state. 2015-08-24 20:05:37 +02:00
Stephen Kelly e3078aa153 cmLocalGenerator: Implement GetFeature in terms of cmState. 2015-08-24 20:04:37 +02:00
Stephen Kelly 7441fde34a cmLocalGenerator: Convert GetFeature recursion to loop. 2015-08-24 20:04:37 +02:00
Stephen Kelly ad0b0089ab cmLocalGenerator: Simplify GetFeature implementation. 2015-08-24 20:04:37 +02:00
Stephen Kelly 314c9ae33b cmLocalGenerator: Make GetFeature tail-recursive. 2015-08-24 20:04:37 +02:00
Stephen Kelly 7fbc56ac40 cmGlobalUnixMakefileGenerator3: Implement progress in terms of cmState. 2015-08-24 20:03:30 +02:00
Stephen Kelly 65c434e1b0 cmGlobalUnixMakefileGenerator3: Inline an IsExcluded call. 2015-08-24 20:03:29 +02:00
Stephen Kelly be56feb618 cmGlobalGenerator: Extract new IsExcluded overload. 2015-08-24 20:03:29 +02:00
Stephen Kelly 45f5200396 cmGlobalGenerator: Implement IsExcluded in terms of cmState::Snapshot. 2015-08-24 20:03:29 +02:00
Stephen Kelly af9fc27753 cmState: Make Snapshot EqualityComparable. 2015-08-24 20:03:29 +02:00
Stephen Kelly 9b44018d52 cmGlobalGenerator: Convert IsExcluded to loop. 2015-08-24 20:03:29 +02:00
Stephen Kelly 5f05b56284 cmGlobalGenerator: Refactor IsExcluded. 
Make it easier to convert it to a loop.
 2015-08-24 20:03:29 +02:00
Stephen Kelly 95925a60fc cmGlobalGenerator: Don't use else after return. 2015-08-24 20:03:29 +02:00
Stephen Kelly f4150bd88d cmState: Move directory Properties from cmMakefile. 2015-08-24 20:02:21 +02:00
Stephen Kelly 0178754725 cmMakefile: Inline GetDefinitions into GetProperty. 
It will soon move to cmState.
 2015-08-24 19:48:45 +02:00
Páder Rezső e7f937155f Use modern libarchive APIs 
Replace use of deprecated libarchive3 functions with their modern
equivalents.
 2015-08-24 10:40:04 -04:00
Brad King 2370a99400 Merge topic 'cmState-definitions' 
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.
 2015-08-24 10:07:04 -04:00
Brad King 58043880b9 Merge topic 'ios-app-bundle-layout' 
744e6c49 Fix iOS Bundle layouts (#15669)
 2015-08-24 10:07:02 -04:00
Brad King eeeb0eb751 Merge topic 'remove-unused-cmPolicies' 
d8a57148 cmake: Remove unused cmPolicies member.
 2015-08-24 10:07:00 -04:00
Brad King d5d86ecf50 Merge topic 'refactor-progress' 
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.
 2015-08-24 10:06:58 -04:00
Brad King 9135e3707d Merge topic 'generators-use-cmLocalGenerator' 
1f39ee5b cmInstallExportGenerator: Require cmLocalGenerator, not cmMakefile.
c259b830 cmTestGenerator: Require cmLocalGenerator, not cmMakefile.
75e511ee cmInstallFilesGenerator: Require cmLocalGenerator, not cmMakefile.
 2015-08-24 10:06:56 -04:00
Brad King aaf9532bbc Merge topic 'fix-include_directories-BEFORE' 
a4bd3010 include_directories: Fix regression in BEFORE option (#15693)
 2015-08-24 10:06:54 -04:00
Gregor Jasny 744e6c497c Fix iOS Bundle layouts (#15669) 
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.
 2015-08-24 09:50:20 -04:00
Kitware Robot 884c63176f CMake Nightly Date Stamp 2015-08-24 00:01:06 -04:00
Stephen Kelly bff27391a9 cmState: Host variable definitions. 2015-08-23 19:05:11 +02:00
Stephen Kelly d8a5714839 cmake: Remove unused cmPolicies member. 
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)
 2015-08-23 18:28:01 +02:00
Stephen Kelly 3fa1b9641d cmGlobalUnixMakefileGenerator3: Change the progress container key. 2015-08-23 18:05:13 +02:00
Stephen Kelly 55e3927634 cmState: Make it possible to order cmState::Snapshot. 2015-08-23 18:05:13 +02:00
Stephen Kelly 04168cbb59 cmGlobalUnixMakefileGenerator3: Rename member. 2015-08-23 18:05:13 +02:00
Stephen Kelly 2394584ce2 cmGlobalGenerator: Rename progress initializer method. 2015-08-23 18:05:13 +02:00
Stephen Kelly b9eb3cd140 cmGlobalGenerator: Move LG to target map to subclass. 
This is the only user.
 2015-08-23 18:05:01 +02:00
Stephen Kelly f5d2b7a694 cmGlobalGenerator: Remove clearance of map. 
It is always cleared before being re-populated.
 2015-08-23 17:49:11 +02:00
Stephen Kelly 1f39ee5beb cmInstallExportGenerator: Require cmLocalGenerator, not cmMakefile. 2015-08-23 17:46:23 +02:00
Stephen Kelly c259b83026 cmTestGenerator: Require cmLocalGenerator, not cmMakefile. 2015-08-23 17:46:07 +02:00
Stephen Kelly 75e511eeaf cmInstallFilesGenerator: Require cmLocalGenerator, not cmMakefile. 2015-08-23 17:21:27 +02:00
Stephen Kelly 6954c8936f cmState: Add a VariableScope snapshot type. 
Match the scopes currently used in cmMakefile for definitions.
 2015-08-23 17:08:54 +02:00
Stephen Kelly 1fc645bd9c cmState: Add a Base snapshot type. 
For completeness mostly.
 2015-08-23 17:08:54 +02:00
Stephen Kelly 0f070dd3e1 cmMakefile: Decouple the container of cmDefinitions from scoping logic. 
Maintain a Parent tree node for writing to in RaiseScope.
 2015-08-23 17:08:53 +02:00
Stephen Kelly 25e04ddffe cmDefinitions: Implement in terms of cmLinkedTree. 
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.
 2015-08-23 17:08:53 +02:00
Stephen Kelly 4bbe261cd3 cmMakefile: Extract InitializeVarScope method. 2015-08-23 17:08:53 +02:00
Kitware Robot b5f17d1b80 CMake Nightly Date Stamp 2015-08-23 00:01:06 -04:00
Kitware Robot 29c1385675 CMake Nightly Date Stamp 2015-08-22 00:01:07 -04:00
Brad King a4bd30104f include_directories: Fix regression in BEFORE option (#15693) 
Refactoring in commit 6ed9c7e0 (cmState: Host buildsystem properties for
directories, 2015-07-18) broke include_directories(BEFORE).  Fix it and
add a test case.
 2015-08-21 15:21:37 -04:00
Brad King 04e708d8df Remove use of include <cmsys/IOStream.hxx> from KWSys 
We no longer need this compatibility layer for the compilers we support.
 2015-08-21 10:54:57 -04:00
Brad King badde9c2a1 Merge topic 'modules-no-soname' 
f799ffb5 Do not set SONAME for MODULE library targets (#15705)
899458ab Tests: Cover NO_SONAME property for SHARED libraries
 2015-08-21 09:29:06 -04:00
Brad King c450686ef2 Merge topic 'OUTPUT_NAME-genex-no-recursion' 
3c37d264 cmGeneratorTarget: Avoid recursion in GetOutputName method
 2015-08-21 09:29:02 -04:00
Brad King cecd0d186d Merge topic 'vs-fix-obj-extension' 
3e94f94b cmLocalVisualStudioGenerator: Use computed .obj extension (#13685)
 2015-08-21 09:28:58 -04:00
Brad King 4ae9362b5b Merge topic 'get-filename-component-base-dir' 
e89ea3d1 get_filename_component:  Teach new BASE_DIR parameter.
 2015-08-21 09:28:53 -04:00
Kitware Robot 3755250f8e CMake Nightly Date Stamp 2015-08-21 00:01:09 -04:00
Brad King e8585f45f5 Remove use of include <cmsys/stl/*> and cmsys_stl::* 
We no longer need this compatibility layer for the compilers we support.
 2015-08-20 16:19:08 -04:00
Brad King 6db713c07f Remove use of include <cmsys/ios/*> and cmsys_ios::* 
We no longer need this compatibility layer for the compilers we support.
 2015-08-20 16:19:08 -04:00
Felix Geyer f799ffb5cb Do not set SONAME for MODULE library targets (#15705) 
The SONAME field is only useful for shared libraries that application
link against.
 2015-08-20 10:45:09 -04:00
Robert Goulet 3c37d2642d cmGeneratorTarget: Avoid recursion in GetOutputName method 
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.
 2015-08-20 09:56:45 -04:00
Kitware Robot e72a5b2c0b CMake Nightly Date Stamp 2015-08-20 00:01:07 -04:00
Kitware Robot 404d16e7bc CMake Nightly Date Stamp 2015-08-19 00:01:08 -04:00
Bastien Schatt 3e94f94b89 cmLocalVisualStudioGenerator: Use computed .obj extension (#13685) 
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.
 2015-08-18 11:39:52 -04:00
Brad King 868be9c640 Merge topic 'cmake-gui-high-resolution' 
a41ebd4e cmake-gui: Add support for HiDPI (Retina) screens on OS X
 2015-08-18 10:12:01 -04:00
Brad King fb329c0bc1 Merge topic 'build-subdir' 
ba1065ab cmake: Add support for "--build ." in subdirectory (#15696)
 2015-08-18 10:11:58 -04:00
Kitware Robot 76a54a4486 CMake Nightly Date Stamp 2015-08-18 00:01:08 -04:00
James Johnston e89ea3d190 get_filename_component: Teach new BASE_DIR parameter. 
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.
 2015-08-17 23:55:38 -04:00
Francois Best a41ebd4ee5 cmake-gui: Add support for HiDPI (Retina) screens on OS X 2015-08-17 11:36:42 -04:00
Brad King a38ea312c0 Merge topic 'propagate-link-search-to-try_compile' 
7f0b83e0 try_compile: Update documentation for other propagated variables
fb77c2c5 try_compile: Propogate the CMAKE_LINK_SEARCH_ variables
 2015-08-17 10:25:04 -04:00
Brad King bc9103ed5b Merge topic 'extended-length-paths' 
e06ea837 cmSystemTools: Use extended length paths for Windows apis.
 2015-08-17 10:25:02 -04:00
Brad King 89b483f2b6 Merge topic 'update-curl' 
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)
 2015-08-17 10:24:49 -04:00
Brad King cb99eff642 Merge topic 'use-generator-target' 
9b449e9c cmComputeLinkInformation: Lookup a target only if we have one
 2015-08-17 10:24:42 -04:00
Kitware Robot 0f27bcc9ec CMake Nightly Date Stamp 2015-08-17 00:01:05 -04:00
Kitware Robot 5c8e1ca283 CMake Nightly Date Stamp 2015-08-16 00:01:05 -04:00
Clinton Stimpson e06ea8373f cmSystemTools: Use extended length paths for Windows apis. 2015-08-14 23:14:06 -06:00
Clinton Stimpson ba1065ab7b cmake: Add support for "--build ." in subdirectory (#15696) 2015-08-14 22:46:53 -06:00
Kitware Robot 1628a8af77 CMake Nightly Date Stamp 2015-08-15 00:01:09 -04:00
Chuck Atkins fb77c2c54b try_compile: Propogate the CMAKE_LINK_SEARCH_ variables 2015-08-14 11:48:01 -04:00
Kitware Robot 17ecfd8210 CMake Nightly Date Stamp 2015-08-14 00:01:08 -04:00
Brad King a07d16085b Merge topic 'OUTPUT_DIRECTORY-genex' 
d25819bc Add generator expression support to OUTPUT_DIRECTORY target properties
e36a05fd cmTarget: Detect and diagnose recursion in GetOutputInfo
 2015-08-13 10:38:54 -04:00
Chuck Atkins 675ef165f2 Allow LINK_SEARCH_{START,END}_STATIC props to have default values. 
Use the CMAKE_LINK_SEARCH_START_STATIC and CMAKE_LINK_SEARCH_END_STATIC
variables to initialize the LINK_SEARCH_START_STATIC and
LINK_SEARCH_END_STATIC target properties respectively.
 2015-08-13 10:34:44 -04:00
Brad King 9b449e9c5d cmComputeLinkInformation: Lookup a target only if we have one 
The change in commit 27252b24 (cmComputeLinkInformation: Simplify
generator object access, 2015-08-02) broke the conditional use of a
target introduced in commit 41abdc17 (cmGeneratorTarget: Move GetSOName
from cmTarget, 2015-08-04).  Restore the conditional lookup.  Add a test
case that hacks platform information variables to trigger this code
everywhere.
 2015-08-13 10:24:10 -04:00
Kitware Robot a0b32a348d CMake Nightly Date Stamp 2015-08-13 00:01:07 -04:00
Brad King 602cdc06a0 cmCurl: Tolerate lack of CURLOPT_CAPATH support 
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.
 2015-08-12 15:43:24 -04:00
Robert Goulet d25819bc26 Add generator expression support to OUTPUT_DIRECTORY target properties 
If {ARCHIVE,LIBRARY,RUNTIME}_OUTPUT_DIRECTORY is set with a genex then
do not add the per-config subdirectory on multi-config generators.
This will allow projects to use $<CONFIG> to place the per-config
part of the directory path somewhere other than the end.
 2015-08-12 13:43:00 -04:00
Robert Goulet e36a05fd7f cmTarget: Detect and diagnose recursion in GetOutputInfo 2015-08-12 13:42:57 -04:00
Brad King 6731eab90c Merge topic 'ctest-report-compiler-version' 
48c6e7f2 CTest: Report to CDash the compiler version used to build the project
 2015-08-12 09:30:29 -04:00
Brad King 7216742ea6 Merge topic 'target_include_directories-relative-SYSTEM-dirs' 
8c076a8b cmTarget: Remove unused AddSystemIncludeDirectories overload
5790aca4 target_include_directories: Support relative SYSTEM include dirs (#15464)
 2015-08-12 09:30:27 -04:00
Kitware Robot b583800203 CMake Nightly Date Stamp 2015-08-12 00:01:06 -04:00
Daniel Pfeifer 48c6e7f2cf CTest: Report to CDash the compiler version used to build the project 
The compiler version reported since commit v2.8.2~1018 (CTest-side
support for compiler name and compiler version, 2009-10-12) only
reported the version of the compiler used to build CMake, and only
if it defined "_COMPILER_VERSION".  Instead use the version of
the compiler used to build the project CTest is testing.
 2015-08-11 09:40:25 -04:00
Gregor Jasny 8c076a8bdb cmTarget: Remove unused AddSystemIncludeDirectories overload 2015-08-11 08:53:38 -04:00
Gregor Jasny 5790aca4ad target_include_directories: Support relative SYSTEM include dirs (#15464) 2015-08-11 08:53:00 -04:00
Brad King 422d3f68de Merge topic 'bootstrap-no-ninja' 
4e3c7725 bootstrap: Do not build Ninja generator
 2015-08-11 08:47:12 -04:00