summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2015-09-171-1/+1
|
* Merge topic 'detect-c11-broken-thread-local'Brad King2015-09-162-0/+35
|\ | | | | | | | | ffa6f057 Avoid using C11 to build CMake if _Thread_local support is broken
| * Avoid using C11 to build CMake if _Thread_local support is brokenRaphael Kubo da Costa2015-09-152-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for C11's _Thread_local was introduced in GCC in the 4.9 series, even though we make the C11 compiler flags available in CMake with GCC >= 4.6. FreeBSD's runetype.h uses _Thread_local, which causes CMake's own build to fail when using GCC < 4.9 and -std=gnu11: /usr/include/runetype.h:92:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'const' extern _Thread_local const _RuneLocale *_ThreadRuneLocale; Add a test for _Thread_local support and only build CMake itself with C11 support if it works. Bug: http://www.cmake.org/Bug/view.php?id=15741
* | Merge topic 'test-search-ordering'Brad King2015-09-162-3/+8
|\ \ | | | | | | | | | | | | | | | | | | 7a6e5f06 Tests: Cover find_program when the environment duplicate some HINTS 40122975 Merge branch 'fix-bad-search-ordering' into test-search-ordering 02440154 find_*: Fix search order when the environment duplicates some HINTS
| * \ Merge branch 'fix-bad-search-ordering' into test-search-orderingBrad King2015-09-152-3/+8
| |\ \
| | * | find_*: Fix search order when the environment duplicates some HINTSChuck Atkins2015-09-142-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in the topic merged by commit v3.2.0-rc1~400 (Merge topic 'refactor-search-path-construction', 2014-11-13) introduced a bug that filters out duplicate paths in an incorrect order. Restore the search path to its documented order even when duplicate paths are present. Reported-by: Marc CHEVRIER <marc.chevrier@sap.com>
* | | | Merge topic 'ccmake-portability'Brad King2015-09-164-25/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7046eedd ccmake: Use more-portable call to set_field_buffer (#15740) da1a02f7 ccmake: Avoid using non-portable 'curcol' field (#15739) 6c442e5a ccmake: Pass format string to 'printw' (#15738)
| * | | | ccmake: Use more-portable call to set_field_buffer (#15740)Thomas Klausner2015-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The set_field_buffer function on NetBSD and Solaris: http://netbsd.gw.com/cgi-bin/man-cgi?set_field_buffer++NetBSD-current https://docs.oracle.com/cd/E36784_01/html/E36880/set-field-buffer-3curses.html has as third argument "char *" while ncurses has "const char *". Cast the argument type in our call to account for the missing "const".
| * | | | ccmake: Avoid using non-portable 'curcol' field (#15739)Joerg Sonnenberger2015-09-161-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'curcol' is an implementation detail of ncurses so other implementations of 'form' may not have it. The switch-to-previous-field logic only exists for overloaded requests of REQ_DEL_PREV, so no need to check for REQ_DEL_CHAR. For REQ_DEL_PREV, check if the field changed and if it did, change it back.
| * | | | ccmake: Pass format string to 'printw' (#15738)Joerg Sonnenberger2015-09-163-17/+20
| | | | | | | | | | | | | | | | | | | | | | | | | printw takes a format string as first argument, so don't pass variable strings to it directly.
* | | | | CMake Nightly Date StampKitware Robot2015-09-161-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'update-kwsys'Brad King2015-09-151-17/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | ef29f5ef Merge branch 'upstream-kwsys' into update-kwsys 7de8f67a KWSys 2015-09-11 (cfeb27cc)
| * | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-09-141-17/+51
| |/ / /
* | | | CMake Nightly Date StampKitware Robot2015-09-151-1/+1
| | | |
* | | | Merge topic 'extend-windows-version-detection'Brad King2015-09-141-5/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | 4734df5f Windows: Set CMAKE_HOST_SYSTEM_VERSION with three components
| * | | Windows: Set CMAKE_HOST_SYSTEM_VERSION with three componentsGilles Khouzam2015-09-111-5/+8
| | | | | | | | | | | | | | | | | | | | Call GetVersionEx with OSVERSIONINFOEX instead of OSVERSIONINFO so that we can get the dwBuildNumber as a third version component.
* | | | Merge topic 'fix_64bit_autodef'Brad King2015-09-141-4/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | db7f069a Windows: Fix 64-bit DLL module definition file generation on VS 2015
| * | | | Windows: Fix 64-bit DLL module definition file generation on VS 2015Bill Hoffman2015-09-141-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With 64-bit Windows builds, there is no need to remove the leading underscore from all the symbols. This is because it does not have one in the .obj file unless it is really in the name. This did not cause any trouble until VS 2015 which has some system functions that have a leading underscore that end up in the .def file.
* | | | | Merge topic 'fix-buildsystem-property-append'Brad King2015-09-142-7/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed258d60 Tests: Cover set_property for buildsystem directory properties fb45c371 cmState: Only append non-empty values to buildsystem properties. 158f7e31 cmMakefile: Use appropriate parameter name. 08ce3f48 cmTarget: Only append non-empty values to buildsystem properties.
| * | | | | cmState: Only append non-empty values to buildsystem properties.Stephen Kelly2015-09-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a change in behavior from CMake 3.3, but there is no semantic meaning to empty entries in buildsystem properties. This also restores behavior to that of CMake 2.8.10.
| * | | | | cmMakefile: Use appropriate parameter name.Stephen Kelly2015-09-111-2/+2
| | | | | |
| * | | | | cmTarget: Only append non-empty values to buildsystem properties.Stephen Kelly2015-09-111-5/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | This is a change in behavior from CMake 3.3, but there is no semantic meaning to empty entries in buildsystem properties. This also restores behavior to that of CMake 2.8.10.
* | | | | Merge topic 'fix-makefile-progress'Brad King2015-09-142-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d6aa364 cmLocalGenerator: Always return the end snapshot state of a directory. 3f4e5e8c cmState: Return end snapshot for GetBuildsystemDirectoryParent.
| * | | | | cmLocalGenerator: Always return the end snapshot state of a directory.Stephen Kelly2015-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for proper makefile progress tracking. The cmLocalGenerator is constructed at configure-time, but only used at generate time. The StateSnapshot member is currently populated before configuring, so use the Makefile to get the end snapshot.
| * | | | | cmState: Return end snapshot for GetBuildsystemDirectoryParent.Stephen Kelly2015-09-111-1/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the appropriate snapshot for future use. Existing users of this method are mostly just calling GetDirectory on the result, but the progress tracking of the Makefile generator needs a consistent snapshot to be used, so the end snapshot should be consistently used.
* | | | | CMake Nightly Date StampKitware Robot2015-09-141-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-09-131-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-09-121-1/+1
|/ / / /
* | | | Merge topic 'fix-TrimWhitespace'Brad King2015-09-111-3/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 9c4a500f cmSystemTools: Fix TrimWhitespace for non-ascii strings (#15735) 87a9061d cmSystemTools: Factor out a cm_isspace helper
| * | | | cmSystemTools: Fix TrimWhitespace for non-ascii strings (#15735)Brad King2015-09-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.11~59^2 (cmSystemTools: Generalize TrimWhitespace to all whitespace, 2013-03-27) we incorrectly use `c <= ' '` to determine if `c` is a whitespace character. With a signed `char` type UTF-8 encoded strings may be truncated because values above 0x7f appear negative and therefore less than 0x20. Use `isspace(c)` instead.
| * | | | cmSystemTools: Factor out a cm_isspace helperBrad King2015-09-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract the logic added by commit v3.1.0-rc1~386^2 (Encoding: Fix debug asserts ... with non-ascii chars, 2014-06-16) into a helper function so we can re-use it.
* | | | | Merge topic 'revert-fix-windows-version-detection'Brad King2015-09-111-46/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4c7744c8 Revert "Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8.1 (#15674)"
| * | | | | Revert "Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8.1 (#15674)"Brad King2015-09-101-46/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d4736d53cd61f2cbbb36bec682663b74b01dddce. RtlGetVersion is a private API not meant for public use. Another solution to detecting the Windows version will be needed. Reported-by: Gilles Khouzam <Gilles.Khouzam@microsoft.com>
* | | | | | CMake Nightly Date StampKitware Robot2015-09-111-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'ghs-updates'Brad King2015-09-101-11/+12
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 04de9007 GHS: Fix generated file path slashes and quoting for 6.1.6 fbe0de92 GHS: Tell MULTI to delete .elf.ael file 63591b94 GHS: Find latest 'int' directory
| * | | | GHS: Fix generated file path slashes and quoting for 6.1.6Geoff Viola2015-09-091-4/+7
| | | | |
| * | | | GHS: Tell MULTI to delete .elf.ael fileGeoff Viola2015-09-091-7/+5
| | |/ / | |/| |
* | | | CMake Nightly Date StampKitware Robot2015-09-101-1/+1
| | | |
* | | | Merge topic 'vs14-win8-store-phone'Brad King2015-09-094-2/+26
|\ \ \ \ | |/ / / |/| | | | | | | | | | | 4b8b9168 VS: Find Desktop SDK for current VS version (#15662)
| * | | VS: Find Desktop SDK for current VS version (#15662)Gilles Khouzam2015-09-024-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | Determine the Desktop SDK for Windows Phone and Windows Store from the generator instead of the version of the targeted app. This allows to build a Windows Phone 8.1 app on VS 2015 for example.
* | | | CMake Nightly Date StampKitware Robot2015-09-091-1/+1
| | | |
* | | | Merge topic 'fix-buildsystem-target-properties'Brad King2015-09-081-24/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b9856862 Tests: Cover set_property for buildsystem target properties 407ff47e cmTarget: Fix memory leak when SOURCES property is cleared cf74fc24 cmTarget: Fix buildsystem property empty value set and append operations
| * | | | cmTarget: Fix memory leak when SOURCES property is clearedBrad King2015-09-031-0/+1
| | | | |
| * | | | cmTarget: Fix buildsystem property empty value set and append operationsBrad King2015-09-031-24/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 1f54bc1c (cmTarget: Split storage of include directories from genexes, 2015-08-04), commit 772ecef4 (cmTarget: Split storage of compile options from genexes, 2015-08-04), commit 44e071ae (cmTarget: Split storage of compile features from genexes, 2015-08-04), and commit 197f4de1 (cmTarget: Split storage of compile definitions from genexes, 2015-08-04) failed to account for value==NULL in SetProperty and AppendProperty methods.
* | | | | Merge topic 'find_program-NAMES_PER_DIR'Brad King2015-09-085-26/+159
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ea7611b find_program: Optionally consider all names in each directory fc1990c9 cmFindProgramCommand: Re-implement search using more flexible approach fdbfc9f6 Tests: Add explicit testing for find_program 907a919b cmSystemTools: Drop unused StringEndsWith method ed4de3c9 cmFindProgramCommand: Use Names member instead of passing it bf32b95e cmFindLibraryCommand: Avoid repeating search for the same name
| * | | | | find_program: Optionally consider all names in each directoryBrad King2015-09-022-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When more than one value is given to the NAMES option this command by default will consider one name at a time and search every directory for it. Add a NAMES_PER_DIR option to tell this command to consider one directory at a time and search for all names in it.
| * | | | | cmFindProgramCommand: Re-implement search using more flexible approachBrad King2015-09-022-1/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid using KWSys SystemTools::FindProgram because it does much more than we actually need for find_program and does not allow us to control the order of preference between directories and names. Create our own cmFindProgramHelper much like cmFindLibraryHelper but without all the find_library-specific parts.
| * | | | | cmSystemTools: Drop unused StringEndsWith methodBrad King2015-09-022-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | It has no callers and we can inherit one from KWSys SystemTools anyway.
| * | | | | cmFindProgramCommand: Use Names member instead of passing itBrad King2015-09-022-13/+10
| | | | | |
| * | | | | cmFindLibraryCommand: Avoid repeating search for the same nameBrad King2015-09-021-2/+9
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In FindNormalLibraryDirsPerName we consider one name at a time and search the entire path. Avoid repeated consideration of names by removing each one from the list of candidates before considering the next one. This will not change behavior because we already know the earlier candidates were not found on repeated considering anyway.