summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | Merge topic 'doc-OBJECT_DEPENDS-limitations'Brad King2015-09-141-5/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2468eb33 Help: Document limitations of the OBJECT_DEPENDS source file property
| * | | | Help: Document limitations of the OBJECT_DEPENDS source file propertyBrad King2015-09-111-5/+8
| |/ / /
* | | | 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 'compiler-features-robustness'Brad King2015-09-111-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 150e1b27 Features: Extract strings from test binary more reliably (#15736)
| * | | | Features: Extract strings from test binary more reliably (#15736)Brad King2015-09-101-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~635^2~7 (project: Add infrastructure for recording CXX compiler features, 2013-10-17) we compile a test source to a binary and then extract "<LANG>_FEATURES:..." strings from the binary with the file(STRINGS) command. Add a newline at the beginning of the string literal to be sure file(STRINGS) can extract the first entry as a string independent of whatever else the compiler may put before the storage it allocates for the literal within the binary.
* | | | 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 'cpack-cmake-special-characters-mangling'Brad King2015-09-106-43/+68
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2a7772ff CPack: don't mangle CMake-special characters when applying default settings
| * | | | CPack: don't mangle CMake-special characters when applying default settingsRoman Donchenko2015-09-096-43/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mangling is prevented by using a function instead of a macro for setting default value of some CPack variables. Function is meant for internal use in CPack.cmake only. Old macro is deprecated but kept for backwards compatibility - was intended for internal use only as it can't be used for CPack after CPack.cmake script is included. Patch removes local workarounds that were required by old macro, fixes default setting of variables that by default inherit value from another variable that already went through old default setting macro (e.g. value of CPACK_PACKAGE_INSTALL_REGISTRY_KEY caused error for wrong escapes if CPACK_PACKAGE_INSTALL_DIRECTORY contained escaped back slashes) and provides a test for correct escaping of characters.
* | | | | Merge topic 'cpack-deb-component-dependencies'Brad King2015-09-104-28/+109
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4de7c812 CPack/Deb: enable per component setting of dependencies
| * | | | | CPack/Deb: enable per component setting of dependenciesDomen Vrankar2015-09-094-28/+109
| |/ / / /
* | | | | Merge topic 'FindwxWidgets-updates'Brad King2015-09-102-5/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8e233d8 Help: Add notes for topic 'FindwxWidgets-updates' 15aacb68 FindwxWidgets: Add wxWidgets webview component 8122fbd0 FindwxWidgets: Expect wxWidgets 3.1 6089fde5 FindwxWidgets: allow specifying required version
| * | | | | Help: Add notes for topic 'FindwxWidgets-updates'Brad King2015-09-091-0/+4
| | | | | |
| * | | | | FindwxWidgets: Add wxWidgets webview componentSimon Richter2015-09-091-1/+1
| | | | | |
| * | | | | FindwxWidgets: Expect wxWidgets 3.1Simon Richter2015-09-091-1/+5
| | | | | |
| * | | | | FindwxWidgets: allow specifying required versionSimon Richter2015-09-091-3/+28
| | | | | |
* | | | | | Merge topic 'FindSWIG-noproxy'Brad King2015-09-101-4/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 96a8890c FindSWIG: Do not generate erroneous outputs with -noproxy
| * | | | | | FindSWIG: Do not generate erroneous outputs with -noproxyBen Webb2015-09-091-4/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generally for a module foo, SWIG generates (in Python mode) an extension module _foo.so and a proxy Python module foo.py. However, if -noproxy is specified, instead it builds only foo.so (without the leading underscore). The custom command generated by CMake correctly handles the removal of this underscore when -noproxy is given; however, it still adds foo.py to the expected outputs. This upsets build tools that expect foo.py to be generated (for example, 'make' will run the SWIG command twice). Fix this by removing foo.py from the set of extra generated files when -noproxy is specified.
* | | | | | Merge topic 'apple-no-libnetwork'Brad King2015-09-101-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01b6ecdb curl: Do not use libnetwork on Apple platforms
generated by cgit v0.12 at 2025-01-08 10:05:36 (GMT)