summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* find_package: Optionally sort globbed directories in a meaningful orderPierluigi Taddei2016-09-1514-17/+341
| | | | | | | | | | | | 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.
* Merge topic 'update-kwsys'Brad King2016-09-159-45/+1112
|\ | | | | | | | | | | | | | | | | 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)
| * Tests: Use upper-case drive letters in RunCMake.get_filename_componentBrad King2016-09-151-6/+6
| | | | | | | | | | | | | | | | With the most recent KWSys update, the "actual case" operation on Windows always upper-cases the drive letter now even for absolute paths that do not exist. Use an upper-case drive letter in the test so that it can tolerate this operation on Windows and the lack of this operation elsewhere.
| * Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-09-143-38/+45
| |\ | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-09-14 (c4049689) Issue: #16295
| | * KWSys 2016-09-14 (c4049689)KWSys Upstream2016-09-143-38/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit c4049689d1ff6e3b9f59358023aebb1a7e0fd149 (master). Upstream Shortlog ----------------- Brad King (2): 0504dcaf SystemTools: Fix path comparison in test case c4049689 SystemTools: Teach GetActualCaseForPath to convert as much as possible
| * | Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-09-145-1/+1061
| |\ \ | | |/ | | | | | | | | | * upstream-KWSys: KWSys 2016-09-14 (e736efa1)
| | * KWSys 2016-09-14 (e736efa1)KWSys Upstream2016-09-145-1/+1061
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit e736efa13ad42a4245b95774d114720ad0877c5b (master). Upstream Shortlog ----------------- Brad King (1): e736efa1 ConsoleBuf: Always compile test source for host Windows version Dāvis Mosāns (1): 669e3a06 ConsoleBuf: Use a custom std::streambuf for console output on Windows
* | | Merge topic 'add-strverscmp'Brad King2016-09-153-4/+155
|\ \ \ | | | | | | | | | | | | | | | | | | | | 88494325 Tests: Add test for our strverscmp implementation 07f69bd5 cmSystemTools: Add strverscmp
| * | | Tests: Add test for our strverscmp implementationPierluigi Taddei2016-09-141-4/+68
| | | | | | | | | | | | | | | | | | | | Cover typical examples and the ordering defined by the `strverscmp(3)` man page.
| * | | 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 'extend_matlab_unit_test'Brad King2016-09-152-23/+69
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4ebb4ae6 FindMatlab: Extend matlab_add_unit_test to run arbitrary test code
| * | | | FindMatlab: Extend matlab_add_unit_test to run arbitrary test codeBill Hoffman2016-09-142-23/+69
| | | | | | | | | | | | | | | | | | | | | | | | | Allow a custom matlab set of commands to be run as the test instead of just `runtests('matlab_file_name')`.
* | | | | 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.
* | | | | | Merge topic 'fix-CMAKE_COMPILER_IS_GNU-confusion'Brad King2016-09-157-18/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 152bbe50 Modules: Fix typos in name of `CMAKE_COMPILER_IS_GNUCC` variable a6d3f541 Help: Clarify documentation of CMAKE_COMPILER_IS_GNU{CC,CXX,G77}
| * | | | | | Modules: Fix typos in name of `CMAKE_COMPILER_IS_GNUCC` variableBrad King2016-09-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not called `CMAKE_COMPILER_IS_GNUC` (without last `C`). Closes: #16297
| * | | | | | Help: Clarify documentation of CMAKE_COMPILER_IS_GNU{CC,CXX,G77}Brad King2016-09-145-16/+18
| | |/ / / / | |/| | | | | | | | | | | | | | | | Closes: #16308
* | | | | | Merge topic 'python-3.7'Brad King2016-09-152-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | c31573b9 FindPython{Interp,Libs}: Add version 3.7
| * | | | | | FindPython{Interp,Libs}: Add version 3.7Yen Chi Hsuan2016-09-142-2/+2
| |/ / / / /
* | | | | | 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-1410-0/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abeb42f1 Help: Add notes for topic 'file-curl-userpw' e5ba1041 file(DOWNLOAD|UPLOAD): Add 'USERPWD' suboption
| * | | | | | | Help: Add notes for topic 'file-curl-userpw'Brad King2016-09-141-0/+5
| | | | | | | |
| * | | | | | | file(DOWNLOAD|UPLOAD): Add 'USERPWD' suboptionRuslan Baratov2016-09-139-0/+43
| | | | | | | |
* | | | | | | | Merge topic 'add_androidmk_generator'Brad King2016-09-1428-116/+1083
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1324-9/+941
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-144-0/+51
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ca2d5d1 cmake-gui: Add button to open the generated project
| * | | | | | | | | cmake-gui: Add button to open the generated projectNico Heßler2016-09-134-0/+51
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Look for VS or Xcode project files at the top of the build tree. If present, enable an "Open Project" button to open them through the OS desktop services.
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-09-141-1/+1
|/ / / / / / / /
* | | | | | | | Merge topic 'cmake-server-prepare'Brad King2016-09-133-22/+50
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e58b9af cmake: Factor out method to find the CMakeCache.txt file c73967cb cmake: Introduce ReportCapabilitiesJson 366e3828 Update .gitignore
| * | | | | | | | cmake: Factor out method to find the CMakeCache.txt fileTobias Hunger2016-09-122-17/+26
| | | | | | | | |
| * | | | | | | | cmake: Introduce ReportCapabilitiesJsonTobias Hunger2016-09-122-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce cmake::ReportCapabilitiesJson which returns a the Json object that is serialized in cmake::ReportCapabilities. This allows to re-use the information in cmake-server.
| * | | | | | | | Update .gitignoreTobias Hunger2016-09-121-0/+5
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Ignore *.user* files from QtCreator and *.pyc files.
* | | | | | | | Merge topic 'timestamp-names'Brad King2016-09-135-0/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 410add40 Help: Add notes for topic 'timestamp-names' 751f7b52 string(TIMESTAMP ...): add '%a' and '%b' format specifiers
| * | | | | | | | Help: Add notes for topic 'timestamp-names'Brad King2016-09-121-0/+6
| | | | | | | | |
generated by cgit v0.12 at 2024-11-13 15:20:11 (GMT)