--- Modules/Platform/BSDSUniX.cmake.orig	2020-08-31 22:41:21.637298000 +1000
+++ Modules/Platform/BSDSUniX.cmake	2020-08-31 22:41:15.248121000 +1000
@@ -0,0 +1,29 @@
+set(CMAKE_DL_LIBS "")
+set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC")
+set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE")
+# PIE link options are managed in Compiler/<compiler>.cmake file
+set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")            # -pic
+set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")       # -shared
+set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")         # +s, flag for exe link to use shared lib
+set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")       # -rpath
+set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")   # : or empty
+# Does not require -z origin since 10.2-RELEASE
+set(CMAKE_SHARED_LIBRARY_RPATH_ORIGIN_TOKEN "\$ORIGIN")
+set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-z,origin,-rpath-link,")
+set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
+set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
+
+# Shared libraries with no builtin soname may not be linked safely by
+# specifying the file path.
+set(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1)
+
+# Initialize C link type selection flags.  These flags are used when
+# building a shared library, shared module, or executable that links
+# to other libraries to select whether to use the static or shared
+# versions of the libraries.
+foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
+  set(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic")
+  set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
+endforeach()
+
+include(Platform/UnixPaths)
--- Modules/Platform/BSDSUniX-Determine-CXX.cmake.orig	2020-08-31 22:42:07.882459000 +1000
+++ Modules/Platform/BSDSUniX-Determine-CXX.cmake	2020-08-31 22:41:58.043185000 +1000
@@ -0,0 +1,3 @@
+if(NOT CMAKE_CXX_COMPILER_NAMES)
+  set(CMAKE_CXX_COMPILER_NAMES c++)
+endif()
--- Modules/Platform/BSDSUniX-CXX.cmake.orig	2020-08-31 22:42:29.077633000 +1000
+++ Modules/Platform/BSDSUniX-CXX.cmake	2020-08-31 22:42:24.038239000 +1000
@@ -0,0 +1,3 @@
+if(NOT CMAKE_CXX_COMPILER_NAMES)
+  set(CMAKE_CXX_COMPILER_NAMES c++)
+endif()
--- Source/cmFileCommand.cxx.orig      2020-09-01 18:07:35.336657000 +1000
+++ Source/cmFileCommand.cxx   2020-09-01 18:23:24.411440000 +1000
@@ -1451,7 +1451,7 @@
     long OldPercentage = this->CurrentPercentage;
 
     if (total > 0.0) {
-      this->CurrentPercentage = std::lround(value / total * 100.0);
+      this->CurrentPercentage = ::lround(value / total * 100.0);
       if (this->CurrentPercentage > 100) {
         // Avoid extra progress reports for unexpected data beyond total.
         this->CurrentPercentage = 100;
--- Source/CTest/cmCTestTestHandler.cxx.orig  2020-08-20 22:20:32.000000000 +1000
+++ Source/CTest/cmCTestTestHandler.cxx       2020-09-01 18:32:43.136706000 +1000
@@ -580,7 +580,7 @@
   }
   cmCTestLog(this->CTest, HANDLER_OUTPUT,
              std::endl
-               << passColorCode << std::lround(percent) << "% tests passed"
+               << passColorCode << lround(percent) << "% tests passed"
                << this->CTest->GetColorCode(cmCTest::Color::CLEAR_COLOR)
                << ", " << failedColorCode << failed.size() << " tests failed"
                << this->CTest->GetColorCode(cmCTest::Color::CLEAR_COLOR)