summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* MSVC: Rewrite manifest file handling with Makefile and NinjaBrad King2015-09-173-200/+223
| | | | | | | | | Add a helper class private to "cmcmd.cxx" to contain the implementation. Update the link logic to use the intermediate files directory for each target to hold manifest and resource files before embedding into the binary. Preserve the old behavior of placing the .manifest file next to the binary when not linking incrementally even though it will be embedded.
* Ninja: Always add OBJECT_DIR variable to link rulesBrad King2015-09-171-3/+4
| | | | | The <OBJECT_DIR> placeholder is always available in Makefile generators so make it available from the Ninja generator too.
* VS: Add manifest tool settings to VS 8 and 9 project filesBrad King2015-09-171-10/+14
| | | | Always generate a VCManifestTool element in targets that compile.
* Tests: Add RunCMake.BuildDepends testBrad King2015-09-177-0/+79
| | | | | This will allow more granular checks than the main BuildDepends test. Start with a simple single-source C program.
* Tests: Teach RunCMake infrastructure to use custom check.cmake fileBrad King2015-09-171-1/+5
|
* Tests: Teach RunCMake to tolerate 'Bullseye Testing' lines in test outputBrad King2015-09-171-1/+1
| | | | | | | | | | When testing under Bullseye coverage, some tests get lines on stderr of the form: ... Bullseye Testing Technology ... Remove such lines from output before matching because they are not representative of the actual test output.
* Tests: Teach RunCMake to tolerate 'Time Machine' lines in test outputBrad King2015-09-171-1/+1
| | | | | | | | | On some OS X machines some tests get lines on stderr of the form: ... attempting to exclude an item from Time Machine by path ... produced by the system. Remove such lines from output before matching because they are not representative of the actual test output.
* Merge topic 'remove-UseVTKConfig40'Brad King2015-09-173-476/+0
|\ | | | | | | | | 6a06ec8d Modules: Drop unused VTK 4.0 support modules
| * Modules: Drop unused VTK 4.0 support modulesBrad King2015-09-163-476/+0
| | | | | | | | | | These modules have been unused since commit v3.1.0-rc1~355^2 (FindVTK: Drop support for finding VTK 4.0, 2014-06-27).
* | CMake Nightly Date StampKitware Robot2015-09-171-1/+1
| |
* | Merge branch 'release'Brad King2015-09-160-0/+0
|\ \ | |/ |/|
| * Merge branch 'fix-bad-search-ordering' into releaseBrad King2015-09-142-3/+8
| |\
| * \ Merge branch 'makefile-color-when-needed' into releaseBrad King2015-08-281-1/+1
| |\ \
| * \ \ Merge branch 'fix-ctest-xml-double-encoding' into releaseBrad King2015-08-288-20/+8
| |\ \ \
| * \ \ \ Merge branch 'determine-compiler-CMP0054' into releaseBrad King2015-08-202-6/+8
| |\ \ \ \
* | \ \ \ \ Merge topic 'detect-c11-broken-thread-local'Brad King2015-09-163-1/+41
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-153-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-167-3/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Tests: Cover find_program when the environment duplicate some HINTSBrad King2015-09-155-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported-by: Marc CHEVRIER <marc.chevrier@sap.com>
| * | | | | | | 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.
* | | | | | | | Merge topic 'FindProtobuf-python-extension'Brad King2015-09-162-4/+69
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ec97b13 FindProtobuf: Add protobuf_generate_python function
| * | | | | | | | FindProtobuf: Add protobuf_generate_python functionAndreas Bergmeier2015-09-152-4/+69
| |/ / / / / / /
* | | | | | | | CMake Nightly Date StampKitware Robot2015-09-161-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge topic 'jsoncpp-portability'Brad King2015-09-151-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75644daf jsoncpp: Fix compilation as C99 on Solaris
| * | | | | | | jsoncpp: Fix compilation as C99 on SolarisJoerg Sonnenberger2015-09-141-1/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | In C99 mode, Solaris variants may already define isfinite, so check for the existence first.
* | | | | | | Merge topic 'doc-string-REGEX-concat'Brad King2015-09-151-82/+221
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3809150a Help: Document string(REGEX) input concatentation (#15742) 5f2c47c4 Help: Organize string command docs into sections
| * | | | | | | Help: Document string(REGEX) input concatentation (#15742)Brad King2015-09-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These commands concatenate all their input before matching. Document this behavior.
| * | | | | | | Help: Organize string command docs into sectionsBrad King2015-09-141-82/+218
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add section headers and titles for each command signature. Group related commands into sections.
* | | | | | | 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
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | KWSys 2015-09-11 (cfeb27cc)KWSys Robot2015-09-141-17/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ cfeb27cc | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' dc3fdd7f..cfeb27cc Gilles Khouzam (2): 27714139 SystemTools: Call GetVersionEx more robustly cfeb27cc SystemTools: Report Windows 7, 8, 8.1 and 10 by name
* | | | | | | | 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 'FindHDF5-updates'Brad King2015-09-142-4/+30
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd26a19a FindHDF5: Add NAMES_PER_DIR and introduce HDF5_PREFER_PARALLEL
| * | | | | | | | | FindHDF5: Add NAMES_PER_DIR and introduce HDF5_PREFER_PARALLELPaul Romano2015-09-112-4/+30
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The calls to find_program now use NAMES_PER_DIR so that the first executable (e.g. h5pcc) appearing on their PATH will get chosen. The HDF5_PREFER_PARALLEL variable swaps the search order when it is set to true in the event that a directory being search contains both h5cc and h5pcc.
* | | | | | | | | Merge topic 'fix-buildsystem-property-append'Brad King2015-09-1413-12/+39
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | Tests: Cover set_property for buildsystem directory propertiesBrad King2015-09-119-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the RunCMake.set_property test with cases covering buildsystem directory properties: * COMPILE_DEFINITIONS * COMPILE_OPTIONS * INCLUDE_DIRECTORIES Also test a non-buildsystem property to document the equivalence in behavior.
| * | | | | | | | | 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-116-10/+10
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-implicit-lib-redhat-hardened-ld'Brad King2015-09-142-1/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97ffbcd8 CMakeParseImplicitLinkInfo: Do not match "VAR=..." as link line (#15737)
| * | | | | | | | | CMakeParseImplicitLinkInfo: Do not match "VAR=..." as link line (#15737)Brad King2015-09-112-1/+8
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling with LDFLAGS='-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld' the compiler output includes a line like COLLECT_GCC_OPTIONS='-specs=/usr/lib/rpm/redhat/redhat-hardened-ld' ... that our link line regex matches due to an argument ending in "-ld". Since it is not really the link line no implicit link information is dectected. Exclude "VAR=..." lines from consideration as link lines to fix this.
generated by cgit v0.12 at 2025-01-31 01:09:59 (GMT)