diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-26 10:17:18 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-07-26 10:17:18 -0400 |
| commit | 4977184128ee0d9c3faa30943f79d47a419cf346 (patch) | |
| tree | 0396f01245b4d08af21087e58367037cdcd4c9f6 /Source | |
| parent | 0079f24f453a872e65804ace594127955c6c114c (diff) | |
| parent | 7fc3f7001a3fcc3dbab90834c6bc2b389b3b38c9 (diff) | |
| download | cmake-4977184128ee0d9c3faa30943f79d47a419cf346.tar.gz | |
Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
KWSys 2021-07-26 (d5fd6ca2)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/kwsys/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index ef615b3fee..7da597121f 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -46,6 +46,8 @@ # Set to empty string to use no default value. # KWSYS_CXX_COMPILE_FEATURES = target_compile_features arguments for KWSys. # +# KWSYS_NO_EXECINFO = Do not use execinfo. +# # Optional settings to setup install rules are as follows: # # KWSYS_INSTALL_BIN_DIR = The installation target directories into @@ -526,7 +528,7 @@ if(KWSYS_USE_SystemInformation) set_property(SOURCE SystemInformation.cxx APPEND PROPERTY COMPILE_DEFINITIONS KWSYS_CXX_HAS_RLIMIT64=1) endif() - if(UNIX) + if(UNIX AND NOT KWSYS_NO_EXECINFO) include(CheckIncludeFileCXX) # check for simple stack trace # usually it's in libc but on FreeBSD diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 006495d3cc..7c26974ef8 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -4360,7 +4360,7 @@ std::string SystemTools::GetOperatingSystemNameAndVersion() # endif bOsVersionInfoEx = GetVersionExA((OSVERSIONINFOA*)&osvi); if (!bOsVersionInfoEx) { - return 0; + return ""; } # ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx # ifdef __clang__ @@ -4499,14 +4499,14 @@ std::string SystemTools::GetOperatingSystemNameAndVersion() L"SYSTEM\\CurrentControlSet\\Control\\ProductOptions", 0, KEY_QUERY_VALUE, &hKey); if (lRet != ERROR_SUCCESS) { - return 0; + return ""; } lRet = RegQueryValueExW(hKey, L"ProductType", nullptr, nullptr, (LPBYTE)szProductType, &dwBufLen); if ((lRet != ERROR_SUCCESS) || (dwBufLen > BUFSIZE)) { - return 0; + return ""; } RegCloseKey(hKey); |