HPCC-20752 Address various code review comments

CMakeLists.txt

@@ -235,8 +235,8 @@ if(TOP_LEVEL_PROJECT)
         set(PACKAGE_FILE_NAME_PREFIX  "hpccsystems-clienttools-${projname}")
     endif()
     if(NOT "${CUSTOM_PACKAGE_SUFFIX}" STREQUAL "")
-    set(CPACK_PACKAGE_NAME "${CPACK_PACKAGE_NAME}-${CUSTOM_PACKAGE_SUFFIX}")
-    set(PACKAGE_FILE_NAME_PREFIX "${PACKAGE_FILE_NAME_PREFIX}-${CUSTOM_PACKAGE_SUFFIX}")
+        set(CPACK_PACKAGE_NAME "${CPACK_PACKAGE_NAME}-${CUSTOM_PACKAGE_SUFFIX}")
+        set(PACKAGE_FILE_NAME_PREFIX "${PACKAGE_FILE_NAME_PREFIX}-${CUSTOM_PACKAGE_SUFFIX}")
     endif()
 
     set(CPACK_PACKAGE_VERSION_MAJOR ${majorver})

cmake_modules/commonSetup.cmake

@@ -79,9 +79,9 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
   endif()
 
   IF (WIN32)
-     option(USE_NATIVE_LIBRARIES "thirdparty libraries are in EXTERNALS_DIRECTORY" OFF)
+     option(USE_NATIVE_LIBRARIES "Search standard OS locations (otherwise in EXTERNALS_DIRECTORY) for 3rd party libraries" OFF)
   ELSE()
-     option(USE_NATIVE_LIBRARIES "Search standard OS locations for thirdparty libraries" ON)
+     option(USE_NATIVE_LIBRARIES "Search standard OS locations (otherwise in EXTERNALS_DIRECTORY) for 3rd party libraries" ON)
   ENDIF()
 
   option(USE_GIT_DESCRIBE "Use git describe to generate build tag" ON)
@@ -391,10 +391,10 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
     IF (NOT ALL_WARNINGS_ON)
       set (WARNINGS_IGNORE "/wd4267 /wd4244 /wd6340 /wd6297 /wd4018 /wd4302 /wd4311 /wd4320 /wd4800") # data conversion warnings
       set (WARNINGS_IGNORE "${WARNINGS_IGNORE} /wd4251 /wd4275") # dll-interface for used by clients
-      set (WARNINGS_IGNORE "${WARNINGS_IGNORE} /wd6246")   # local variable hidden by outter scope
+      set (WARNINGS_IGNORE "${WARNINGS_IGNORE} /wd6246")   # local variable hidden by outer scope
       set (WARNINGS_IGNORE "${WARNINGS_IGNORE} /wd6031")   # Return value ignored
       set (WARNINGS_IGNORE "${WARNINGS_IGNORE} /wd4005")   # MACRO redef: same value
-      set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${WARNINGS_IGNORE}")
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNINGS_IGNORE}")
     ENDIF()
 
 

common/remote/sockfile.cpp

@@ -1,4 +1,4 @@
-/*##############################################################################
+/*##############################################################################
 
     HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
 

configuration/configmgr/configmgrlib/EnvSupportLib.cpp

@@ -53,7 +53,7 @@ EnvSupportLib::~EnvSupportLib()
 {
     if (m_libHandle != nullptr)
     {
-        CloseSharedObject(m_libHandle);
+        FreeSharedObject(m_libHandle);
         m_libHandle = nullptr;
     }
 }

dali/dafilesrv/dafilesrv.cpp

@@ -1,4 +1,4 @@
-/*##############################################################################
+/*##############################################################################
 
     HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
 

system/include/platform.h

@@ -172,7 +172,6 @@ typedef memsize_t rowsize_t;
 #define LoadSucceeded(h)           ((memsize_t)h >= 32)
 #define GetSharedObjectError()     GetLastError()
 #define GetSharedObjectErrorString() strerror(errno)
-#define CloseSharedObject(h)        FreeLibrary(h)
 #define strtok_r(a,b,c)            j_strtok_r(a,b,c)
 #define __builtin_prefetch(addr)   _mm_prefetch((const char *)(addr), _MM_HINT_T0)
 
@@ -470,7 +469,6 @@ typedef int socklen_t;
 #define LoadSucceeded(h)            (h != NULL)
 #define GetSharedObjectError()      errno
 #define GetSharedObjectErrorString() dlerror()
-#define CloseSharedObject(h)        dlclose(h)
 
 #define ThreadId pthread_t
 #define MutexId pthread_mutex_t