Merge pull request #8054 from bigladder/fix-windows-ci-warnings

Fix Windows CI Warnings/Messages
NREL · Jun 15, 2020 · 6205345 · 6205345 · nrel-bot-2b · Jun 15, 2020
2 parents b2090e7 + 535f8c5
commit 6205345
Show file tree

Hide file tree

Showing 83 changed files with 1,346 additions and 1,287 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,6 +13,8 @@ if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER "3.0")
   CMAKE_POLICY(SET CMP0054 NEW) # CMake 3.1 added this policy
 endif()
 
+cmake_policy(SET CMP0012 NEW)  # if() recognizes boolean constants
+
 set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH} )
 
 set( CMAKE_POSITION_INDEPENDENT_CODE ON )

diff --git a/cmake/CMakeAddFortranSubdirectory/config_mingw.cmake.in b/cmake/CMakeAddFortranSubdirectory/config_mingw.cmake.in
@@ -9,5 +9,6 @@ execute_process(
   -DCMAKE_VERSION_MINOR:STRING=@CMAKE_VERSION_MINOR@
   -DCMAKE_VERSION_PATCH:STRING=@CMAKE_VERSION_PATCH@
   -DCMAKE_VERSION_BUILD:STRING=@CMAKE_VERSION_BUILD@
+  --no-warn-unused-cli
   ${CMAKE_COMMAND_LINE}
   "@source_dir@")
diff --git a/cmake/CompilerFlags.cmake b/cmake/CompilerFlags.cmake
@@ -12,6 +12,12 @@ ADD_DEFINITIONS("-DXML_STATIC")
 
 IF ( MSVC AND NOT ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" ) ) # Visual C++ (VS 2013)
 
+    # COMPILER FLAGS
+    ADD_COMPILE_OPTIONS("/nologo")
+    ADD_COMPILE_OPTIONS("/EHsc")
+    ADD_COMPILE_OPTIONS("/MP") # Enables multi-processor compilation of source within a single project
+    STRING (REGEX REPLACE "/W3" "/W1" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # Increase to /W2 then /W3 as more serious warnings are addressed (using regex to avoid VC override warnings)
+
     # Disabled Warnings: Enable some of these as more serious warnings are addressed
     #  4068 Unknown pragma
     #  4101 Unreferenced local variable
@@ -21,16 +27,10 @@ IF ( MSVC AND NOT ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" ) ) # Visual C++
     #  4355 Passing this pointer in class initializer (object is incomplete so bases/members can only use this in limited ways)
     #  4996 Deprecated functions (/D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS)
     #  4503 The decorated name was longer than the compiler limit (4096), and was truncated.
+    ADD_COMPILE_OPTIONS(/wd4068 /wd4101 /wd4102 /wd4244 /wd4258 /wd4355 /wd4996 /wd4503) # Disables warning messages listed above
 
-    # COMPILER FLAGS
-    ADD_CXX_DEFINITIONS("/nologo")
-    ADD_CXX_DEFINITIONS("/EHsc")
-    ADD_CXX_DEFINITIONS("/MP") # Enables multi-processor compilation of source within a single project
-    STRING (REGEX REPLACE "/W3" "/W1" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # Increase to /W2 then /W3 as more serious warnings are addressed (using regex to avoid VC override warnings)
-
-    ADD_CXX_DEFINITIONS("/wd4068 /wd4101 /wd4102 /wd4244 /wd4258 /wd4355 /wd4996 /wd4503") # Disables warning messages listed above
-    ADD_CXX_DEFINITIONS("/DNOMINMAX") # Avoid build errors due to STL/Windows min-max conflicts
-    ADD_CXX_DEFINITIONS("/DWIN32_LEAN_AND_MEAN") # Excludes rarely used services and headers from compilation
+    ADD_DEFINITIONS(/DNOMINMAX) # Avoid build errors due to STL/Windows min-max conflicts
+    ADD_DEFINITIONS(/DWIN32_LEAN_AND_MEAN) # Excludes rarely used services and headers from compilation
     #    ADD_CXX_DEFINITIONS("-d2SSAOptimizer-") # this disables this optimizer which has known major issues
 
     # ADDITIONAL RELEASE-MODE-SPECIFIC FLAGS

diff --git a/src/AppGPostProcess/CMakeLists.txt b/src/AppGPostProcess/CMakeLists.txt
@@ -1,5 +1,9 @@
 project(AppGPostProcess Fortran)
 
+cmake_minimum_required(VERSION 3.5.1)
+
+cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants
+
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )

diff --git a/src/Basement/CMakeLists.txt b/src/Basement/CMakeLists.txt
@@ -1,5 +1,9 @@
 project(Basement Fortran)
 
+cmake_minimum_required(VERSION 3.5.1)
+
+cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants
+
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )

diff --git a/src/CalcSoilSurfTemp/CMakeLists.txt b/src/CalcSoilSurfTemp/CMakeLists.txt
@@ -1,5 +1,9 @@
 project(CalcSoilSurfTemp Fortran)
 
+cmake_minimum_required(VERSION 3.5.1)
+
+cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants
+
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )

diff --git a/src/ConvertESOMTR/CMakeLists.txt b/src/ConvertESOMTR/CMakeLists.txt
@@ -1,5 +1,9 @@
 project(ConvertESOMTR Fortran)
 
+cmake_minimum_required(VERSION 3.5.1)
+
+cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants
+
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )

diff --git a/src/EnergyPlus/ExternalInterface.cc b/src/EnergyPlus/ExternalInterface.cc
@@ -533,7 +533,7 @@ namespace ExternalInterface {
             StopExternalInterfaceIfError();
 
             // make a single length here for all strings to be passed to getepvariables
-            int lenXmlStr(maxVar * DataGlobals::MaxNameLength); // Length of strings being passed to getepvariables
+            size_t lenXmlStr(maxVar * DataGlobals::MaxNameLength); // Length of strings being passed to getepvariables
 
             // initialize all the strings to this length with blanks
             xmlStrOut = std::string(lenXmlStr, ' ');

diff --git a/src/ExpandObjects/CMakeLists.txt b/src/ExpandObjects/CMakeLists.txt
@@ -1,5 +1,9 @@
 project(ExpandObjects Fortran)
 
+cmake_minimum_required(VERSION 3.5.1)
+
+cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants
+
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )

diff --git a/src/HVAC-Diagram/CMakeLists.txt b/src/HVAC-Diagram/CMakeLists.txt
@@ -1,5 +1,9 @@
 project(HVAC-Diagram Fortran)
 
+cmake_minimum_required(VERSION 3.5.1)
+
+cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants
+
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )

diff --git a/src/ParametricPreprocessor/CMakeLists.txt b/src/ParametricPreprocessor/CMakeLists.txt
@@ -1,5 +1,9 @@
 project(ParametricPreprocessor Fortran)
 
+cmake_minimum_required(VERSION 3.5.1)
+
+cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants
+
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )

diff --git a/src/ReadVars/CMakeLists.txt b/src/ReadVars/CMakeLists.txt
@@ -1,5 +1,9 @@
 project(ReadVars Fortran)
 
+cmake_minimum_required(VERSION 3.5.1)
+
+cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants
+
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )

diff --git a/src/Slab/CMakeLists.txt b/src/Slab/CMakeLists.txt
@@ -1,5 +1,9 @@
 project(Slab Fortran)
 
+cmake_minimum_required(VERSION 3.5.1)
+
+cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants
+
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )

diff --git a/src/Transition/CMakeLists.txt b/src/Transition/CMakeLists.txt
@@ -1,5 +1,9 @@
 project(Transition Fortran)
 
+cmake_minimum_required(VERSION 3.5.1)
+
+cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants
+
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
 set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )

diff --git a/third_party/BCVTB/CMakeLists.txt b/third_party/BCVTB/CMakeLists.txt
@@ -12,18 +12,16 @@ ENDIF()
 
 INCLUDE_DIRECTORIES( "${PROJECT_SOURCE_DIR}/third_party/Expat/lib")
 
+IF (UNIX)
+  ADD_DEFINITIONS("-fPIC")
+ENDIF()
+
 ADD_LIBRARY( bcvtb STATIC ${SRC} )
 
 IF( WIN32 )
   TARGET_LINK_LIBRARIES( bcvtb wsock32 )
 ENDIF()
 
-IF( MSVC )
-  ADD_DEFINITIONS( "/w" )
-ELSE()
-  ADD_DEFINITIONS( "-w -fPIC" )
-ENDIF()
-
 set_target_properties(
   bcvtb
   PROPERTIES

diff --git a/third_party/BCVTB/utilSocket.c b/third_party/BCVTB/utilSocket.c
@@ -117,10 +117,10 @@ derivative works thereof, in binary and source code form.
 #include "utilXml.h"
 
 
-FILE *f1 = NULL; 
+FILE *f1 = NULL;
 int REQUIRED_READ_LENGTH  = 0;
 int REQUIRED_WRITE_LENGTH = 0;
-int SERVER_VERSION = 0; 
+int SERVER_VERSION = 0;
 
 // Global variable to check for FMUExport case
 int FMUEXPORT = 0;
@@ -137,10 +137,10 @@ int FMUEXPORT = 0;
 ///\param bufLen The length of the character array \c buffer. This parameter will
 ///              be set to the new size of \c buffer if memory was reallocated.
 ///\return 0 if no error occurred.
-int save_append(char* *buffer, const char *toAdd, int *bufLen){
-  const int size = 1024;
-  const int nNewCha = strlen(toAdd);
-  const int nBufCha = strlen(*buffer);
+int save_append(char* *buffer, const char *toAdd, size_t *bufLen){
+  const size_t size = 1024;
+  const size_t nNewCha = strlen(toAdd);
+  const size_t nBufCha = strlen(*buffer);
   // reallocate memory if needed
   if ( *bufLen < nNewCha + nBufCha + 1){
     *bufLen = *bufLen + size * (((nNewCha + nBufCha) / size)+1);
@@ -175,7 +175,7 @@ int assembleBuffer(int flag,
 		    int nDbl, int nInt, int nBoo,
 		    double curSimTim,
 		    double dblVal[], int intVal[], int booVal[],
-		    char* *buffer, int *bufLen)
+		    char* *buffer, size_t *bufLen)
 {
   int i;
   int retVal;
@@ -317,7 +317,6 @@ int disassembleHeaderBuffer(const char* buffer,
   int retVal;    // return value
   //////////////////////////////////////////////////////
   // Get first few integers to set up dictionaray
-  int i;
   // set number of received values to zero to ensure that
   // if retVal != 0, we have the values initialized
   *nDbl = 0;
@@ -429,7 +428,7 @@ int getsocketportnumber(const char *const docname) {
   int retVal;
   char *xPat = "//ipc/socket[@port]";
   char *res;
-  int i;
+  size_t i;
   res = malloc(BUFFER_LENGTH);
   if (res == NULL) {
     perror("malloc failed in getsocketportnumber.");
@@ -468,7 +467,7 @@ int getmainversionnumber(){
 /// \return 0 if successful, or -1 if an error occured.
 int getsockethost(const char *const docname, char *const hostname) {
   char *xPat = "//ipc/socket[@hostname]";
-  int i;
+  size_t i;
   int r = getxmlvalue(docname, xPat, hostname, &i, BUFFER_LENGTH);
   return r;
 }
@@ -669,7 +668,7 @@ int writetosocket(const int *sockfd,
   int retVal;
   // buffer used to exchange data
   char *buffer;
-  int bufLen = REQUIRED_WRITE_LENGTH;
+  size_t bufLen = REQUIRED_WRITE_LENGTH;
 
 #ifdef NDEBUG
   if (f1 == NULL) // open file
@@ -734,7 +733,7 @@ if (*sockfd < 0 ){
 #endif
 
 #ifdef _MSC_VER
-    retVal = send(*sockfd,buffer,strlen(buffer), 0);
+    retVal = send(*sockfd,buffer,(int)strlen(buffer), 0);
 #else
   retVal = write(*sockfd,buffer,strlen(buffer));
 #endif
@@ -897,7 +896,7 @@ int readfromsocket(const int *sockfd, int *flaRea,
 		   double *curSimTim,
 		   double dblValRea[], int intValRea[], int booValRea[])
 {
-  int retVal, i;
+  int retVal;
   char *inpBuf;
   /////////////////////////////////////////////////////
   // make sure that the socketFD is valid
@@ -976,6 +975,7 @@ int readfromsocket(const int *sockfd, int *flaRea,
 ///\return The exit value of the \c read command.
 int readbufferfromsocket(const int *sockfd,
 			 char *buffer, int *bufLen){
+  (void)bufLen;
   int retVal;
   int reachedEnd = 0;
   // The number 8192 needs to be the same as in Server.java

diff --git a/third_party/BCVTB/utilSocket.h b/third_party/BCVTB/utilSocket.h
@@ -155,7 +155,7 @@ extern int SERVER_VERSION;
 ///\param bufLen The length of the character array \c buffer. This parameter will
 ///              be set to the new size of \c buffer if memory was reallocated.
 ///\return 0 if no error occurred.
-int save_append(char* *buffer, const char *toAdd, int *bufLen);
+int save_append(char* *buffer, const char *toAdd, size_t *bufLen);
 
 ////////////////////////////////////////////////////////////////
 /// Assembles the buffer that will be exchanged through the IPC.
@@ -174,7 +174,7 @@ int assembleBuffer(int flag,
 		   int nDbl, int nInt, int nBoo,
 		   double curSimTim,
 		   double dblVal[], int intVal[], int booVal[],
-		   char* *buffer, int *bufLen);
+		   char* *buffer, size_t *bufLen);
 
 /////////////////////////////////////////////////////////////////
 /// Gets an integer and does the required error checking.