summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge topic 'check-for-unique_ptr'Brad King2016-09-194-0/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa50cdac Check for availability of unique_ptr and make_unique when building CMake
| * | | | | | | | | Check for availability of unique_ptr and make_unique when building CMakeBrad King2016-09-164-0/+19
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Some code paths may find these useful if available.
* | | | | | | | | Merge topic 'find-package-mode-fixes'Brad King2016-09-192-2/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a098ca0d cmake: Fix --find-package mode link line output d9c600c5 cmGlobalGenerator: Fix use of uninitialized value in --find-package mode
| * | | | | | | | | cmake: Fix --find-package mode link line outputBrad King2016-09-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v2.8.10~58^2~2 (Ninja: move -LIBPATH behind -link option, 2012-09-26) added arguments to cmLocalGenerator::GetTargetFlags and updated the call sites. However, in the cmake::FindPackage and cmLocalGenerator::AddBuildTargetRule call sites it added the new arguments in the wrong order. The latter was never used and has been removed. The former remains buggy and prints out compiler flags instead of the link framework/library search paths. Fix its argument order.
| * | | | | | | | | cmGlobalGenerator: Fix use of uninitialized value in --find-package modeBrad King2016-09-161-0/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-09-191-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-09-181-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-09-171-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'refactor-target-construction'Brad King2016-09-164-157/+154
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9353d991 cmTarget: Remove unused support for partial construction fa3897b2 cmGlobalGenerator: Refactor global target construction 916d8445 cmGlobalGenerator: Split CreateDefaultGlobalTargets implementation
| * | | | | | | | | cmTarget: Remove unused support for partial constructionBrad King2016-09-152-26/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer need to support partial construction for cmTarget instances of type GLOBAL_TARGET. Require all constructor arguments up front.
| * | | | | | | | | cmGlobalGenerator: Refactor global target constructionBrad King2016-09-152-120/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid using partially-constructed cmTarget instances. Collect the information about how to construct each target in a separate structure and then actually create each cmTarget with full construction.
| * | | | | | | | | cmGlobalGenerator: Split CreateDefaultGlobalTargets implementationBrad King2016-09-152-35/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Divide this long method into multiple helpers each dedicated to one of the targets. This also avoids having to clear/re-use local structures.
* | | | | | | | | | Merge topic 'size-empty'Brad King2016-09-1644-46/+46
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73f648f1 use empty method to check for emptyness
| * | | | | | | | | | use empty method to check for emptynessDaniel Pfeifer2016-09-1544-46/+46
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'detect-relink-incompat'Brad King2016-09-161-1/+22
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72dfca30 ninja: error out on relink requirements
| * | | | | | | | | | ninja: error out on relink requirementsBen Boeckel2016-09-151-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja does not support PRE_INSTALL_SCRIPT properties and does not perform the relink required by installation without help from some other mechanism, so error out if it would be required. Issue: #13934, #16304
* | | | | | | | | | | Merge topic 'file-curl-httpheader'Brad King2016-09-161-0/+36
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f6cb366 file(DOWNLOAD|UPLOAD): Add HTTPHEADER suboption
| * | | | | | | | | | | file(DOWNLOAD|UPLOAD): Add HTTPHEADER suboptionRuslan Baratov2016-09-151-0/+36
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'find_package-dir-sort'Brad King2016-09-162-13/+131
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31be918b find_package: Optionally sort globbed directories in a meaningful order
| * | | | | | | | | | | find_package: Optionally sort globbed directories in a meaningful orderPierluigi Taddei2016-09-152-13/+131
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `CMAKE_FIND_PACKAGE_SORT_{ORDER,DIRECTION}` variables to specify sort order and direction. When multiple package with the same name have been found in the same location sorting option can be used to force a specific version to be loaded (e.g. libA_1.12.0 instead of libA_1.1.0). Currently sorting by NAME and by NATURAL order have been implemented. Natural ordering makes use of the `strverscmp(3)` ordering.
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2016-09-161-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge topic 'update-kwsys'Brad King2016-09-158-39/+1106
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | de149317 Tests: Use upper-case drive letters in RunCMake.get_filename_component 04d94fbe Merge branch 'upstream-KWSys' into update-kwsys d28e4467 KWSys 2016-09-14 (c4049689) e4fc770f Merge branch 'upstream-KWSys' into update-kwsys b80d6136 KWSys 2016-09-14 (e736efa1)
| * | | | | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-09-143-38/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-09-14 (c4049689) Issue: #16295
| * | | | | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-09-145-1/+1061
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-09-14 (e736efa1)
* | | | | | | | | | Merge topic 'add-strverscmp'Brad King2016-09-152-0/+87
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88494325 Tests: Add test for our strverscmp implementation 07f69bd5 cmSystemTools: Add strverscmp
| * | | | | | | | | | cmSystemTools: Add strverscmpBrad King2016-09-132-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for natural string order by comparing non-numerical character directly and numerical number by firstly collecting contiguous digits. The order is defined by the `strverscmp(3)` manual [1]. [1] http://man7.org/linux/man-pages/man3/strverscmp.3.html Inspired-by: Pierluigi Taddei <pierluigi.taddei@gmail.com>
* | | | | | | | | | | Merge topic 'refactor-target-construction'Brad King2016-09-156-78/+114
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a2e114d cmTarget: Inline SetType method at only remaining call site 00e78c19 cmTarget: Construct with basic information up front 9d11bd50 Avoid requiring default cmTarget constructor for map indexing d97513d8 cmTarget: Add method to get a copy adapted for a directory
| * | | | | | | | | | cmTarget: Inline SetType method at only remaining call siteBrad King2016-09-142-10/+6
| | | | | | | | | | |
| * | | | | | | | | | cmTarget: Construct with basic information up frontBrad King2016-09-145-32/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid having partially constructed cmTarget instances around, except for the special case of GLOBAL_TARGET construction.
| * | | | | | | | | | Avoid requiring default cmTarget constructor for map indexingBrad King2016-09-143-41/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `std::map<>` index operator requires a default constructor on the value type. Avoid requiring a default constructor on `cmTarget` just for this purpose.
| * | | | | | | | | | cmTarget: Add method to get a copy adapted for a directoryBrad King2016-09-142-0/+12
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "global" targets are built once for the top directory and then copied into all directories. Add a helper method to make the copy.
* | | | | | | | | | Merge topic 'cmake-static-FindCacheFile'Brad King2016-09-152-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc770e76 cmake: Make FindCacheFile a static method
| * | | | | | | | | | cmake: Make FindCacheFile a static methodBrad King2016-09-142-2/+2
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does not need access to member data.
* | | | | | | | | | Merge topic 'fix-ccmake-sun-gcc'Brad King2016-09-152-8/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4d0c942 ccmake: Fix recent compilation regression with GCC on Solaris
| * | | | | | | | | ccmake: Fix recent compilation regression with GCC on SolarisBrad King2016-09-142-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit 32f756c8 (CursesDialog: include what you use, 2016-09-01) revealed that an ancient workaround for compiling with GCC on Solaris has not had an effect in a long time and is now incorrect. Drop it.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-09-151-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'minor-cleanup'Brad King2016-09-141-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a9ed3d4 cmGeneratorTarget: factor out a space
| * | | | | | | | | cmGeneratorTarget: factor out a spaceBen Boeckel2016-09-131-3/+3
| | | | | | | | | |
* | | | | | | | | | Merge topic 'cmake-E-help-order'Brad King2016-09-141-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e952f1bd cmcmd: Fix sort order in help output
| * | | | | | | | | | cmcmd: Fix sort order in help outputTobias Hunger2016-09-131-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | sort "sleep" before "tar", not after
* | | | | | | | | | Merge topic 'file-curl-userpw'Brad King2016-09-141-0/+26
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abeb42f1 Help: Add notes for topic 'file-curl-userpw' e5ba1041 file(DOWNLOAD|UPLOAD): Add 'USERPWD' suboption
| * | | | | | | | | | file(DOWNLOAD|UPLOAD): Add 'USERPWD' suboptionRuslan Baratov2016-09-131-0/+26
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'add_androidmk_generator'Brad King2016-09-1417-114/+947
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42ce9f1e Add support for creating prebuilt Android.mk files d5257063 Export: Virtualize file generation step helpers f81b9475 Export: Factor out file generation steps into helpers
| * | | | | | | | | | | Add support for creating prebuilt Android.mk filesBill Hoffman2016-09-1313-7/+805
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add options to the `install()` and `export()` commands to export the targets we build into Android.mk files that reference them as prebuilt libraries with associated usage requirements (compile definitions, include directories, link libraries). This will allow CMake-built projects to be imported into projects using the Android NDK build system. Closes: #15562
| * | | | | | | | | | | Export: Virtualize file generation step helpersBill Hoffman2016-09-082-25/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow subclasses to override the actual content generation.
| * | | | | | | | | | | Export: Factor out file generation steps into helpersBill Hoffman2016-09-084-87/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not actually generate any content in the driving code paths. Use helpers for that.
* | | | | | | | | | | | Merge topic 'ctest-subdir-spaces'Brad King2016-09-141-8/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f8613e9 Fix CTest test file generation for spaces in subdirectory names 385e6a27 cmLocalGenerator: Refactor test subdirectory generation loop
| * | | | | | | | | | | | Fix CTest test file generation for spaces in subdirectory namesStefano Soffia2016-09-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encode the subdirectory names properly for CMake syntax. Closes: #16299
| * | | | | | | | | | | | cmLocalGenerator: Refactor test subdirectory generation loopStefano Soffia2016-09-131-8/+6
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge topic 'cmake-gui-open-project'Brad King2016-09-143-0/+46
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ca2d5d1 cmake-gui: Add button to open the generated project