Merge pull request #7137 from xwang2713/HPCC_13251

HPCC-13251 Fix HPCC Windows VS 9 2008 Win64 errors

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

cmake_modules/FindBOOST_REGEX.cmake

@@ -43,11 +43,7 @@ IF (NOT BOOST_REGEX_FOUND)
         SET (boost_regex_lib "libboost_regex-mt.a")
       ENDIF()
     ELSEIF(WIN32)
-      IF (${ARCH64BIT} EQUAL 1)
-        SET (boost_regex_lib "boost_regex-vc100-mt.lib")
-      ELSE()
-        SET (boost_regex_lib "libboost_regex-vc90-mt.lib") # note - this may not be the lib we need, but should be in same place as it...
-      ENDIF()
+      SET (boost_regex_lib "boost_regex-vc90-mt-1_57.lib")
     ENDIF()
     IF (NOT "${EXTERNALS_DIRECTORY}" STREQUAL "")
       IF (UNIX)
@@ -57,11 +53,11 @@ IF (NOT BOOST_REGEX_FOUND)
         SET (osdir "linux-i686-gcc4")
         ENDIF()
       ELSEIF(WIN32)
-    IF (${ARCH64BIT} EQUAL 1)
-      SET (osdir "windows-x86_64-vc100")
-    ELSE()
-      SET (osdir "windows-i386-vc90")
-    ENDIF()
+        IF (${ARCH64BIT} EQUAL 1)
+          SET (osdir "windows-x86_64-vc90")
+        ELSE()
+          SET (osdir "windows-i386-vc90")
+        ENDIF()
       ELSE()
         SET (osdir "unknown")
       ENDIF()

cmake_modules/FindMYSQL.cmake

@@ -36,13 +36,19 @@ IF (NOT MYSQL_FOUND)
         SET (osdir "linux32_gcc4.1.1")
       ENDIF()
     ELSEIF(WIN32)
-      SET (osdir "lib")
+      IF (${ARCH64BIT} EQUAL 1)
+        SET (osdir "win64")
+      ELSE()
+        SET (osdir "win32")
+      ENDIF()
     ELSE()
       SET (osdir "unknown")
     ENDIF()
     IF (NOT ("${osdir}" STREQUAL "unknown"))
-      FIND_PATH (MYSQL_INCLUDE_DIR NAMES mysql.h PATHS "${EXTERNALS_DIRECTORY}/mysql/include" NO_DEFAULT_PATH)
-      FIND_LIBRARY (MYSQL_LIBRARIES NAMES ${mysql_lib} PATHS "${EXTERNALS_DIRECTORY}/mysql/${osdir}" NO_DEFAULT_PATH)
+      FIND_PATH (MYSQL_INCLUDE_DIR NAMES mysql.h PATHS "${EXTERNALS_DIRECTORY}/mysql/${osdir}/include"
+        "${EXTERNALS_DIRECTORY}/mysql/include" NO_DEFAULT_PATH)
+      FIND_LIBRARY (MYSQL_LIBRARIES NAMES ${mysql_lib} PATHS "${EXTERNALS_DIRECTORY}/mysql/${osdir}/lib"
+        "${EXTERNALS_DIRECTORY}/mysql/${osdir}" "${EXTERNALS_DIRECTORY}/mysql/lib" NO_DEFAULT_PATH)
     ENDIF()
   ENDIF()
 

cmake_modules/FindOPENLDAP.cmake

@@ -44,7 +44,11 @@ IF (NOT OPENLDAP_FOUND)
       ENDIF()
     ELSEIF(WIN32)
         SET (osincdir "winldap/include")
-        SET (oslibdir "winldap/lib")
+        IF (${ARCH64BIT} EQUAL 1)
+           SET (oslibdir "winldap/lib64")
+        ELSE()
+           SET (oslibdir "winldap/lib32")
+        ENDIF()
     ELSE()
       SET (osincdir "unknown")
     ENDIF()

cmake_modules/FindXALAN.cmake

@@ -37,13 +37,18 @@ IF (NOT XALAN_FOUND)
         SET (osdir "linux32_gcc4.1.1")
       ENDIF()
     ELSEIF(WIN32)
-      SET (osdir "xalan-c/lib")
+      IF (${ARCH64BIT} EQUAL 1)
+        SET (osdir "xalan-c/win64")
+      ELSE()
+        SET (osdir "xalan-c/win32")
+      ENDIF()
     ELSE()
       SET (osdir "unknown")
     ENDIF()
     IF (NOT ("${osdir}" STREQUAL "unknown"))
-      FIND_PATH (XALAN_INCLUDE_DIR NAMES xalanc/XPath/XObjectFactory.hpp PATHS "${EXTERNALS_DIRECTORY}/xalan/xalan-c/include" NO_DEFAULT_PATH)
-      FIND_LIBRARY (XALAN_LIBRARIES NAMES ${xalan_libs} PATHS "${EXTERNALS_DIRECTORY}/xalan/${osdir}" NO_DEFAULT_PATH)
+      FIND_PATH (XALAN_INCLUDE_DIR NAMES xalanc/XPath/XObjectFactory.hpp PATHS "${EXTERNALS_DIRECTORY}/xalan/${osdir}/include"
+            "${EXTERNALS_DIRECTORY}/xalan/xalan-c/include" NO_DEFAULT_PATH)
+      FIND_LIBRARY (XALAN_LIBRARIES NAMES ${xalan_libs} PATHS "${EXTERNALS_DIRECTORY}/xalan/${osdir}/lib" NO_DEFAULT_PATH)
     ENDIF() 
   ENDIF()
 

cmake_modules/FindXERCES.cmake

@@ -24,11 +24,7 @@
 
 if (NOT XERCES_FOUND)
   IF (WIN32)
-    IF (${ARCH64BIT} EQUAL 1)
-      SET (xerces_libs "xerces-c_3")
-    ELSE()
-      SET (xerces_libs "xerces-c_2")
-    ENDIF()
+    SET (xerces_libs "xerces-c_3")
   ELSE()
     SET (xerces_libs "xerces-c")
   ENDIF()
@@ -41,13 +37,18 @@ if (NOT XERCES_FOUND)
         SET (osdir "linux32_gcc4.1.1")
       ENDIF()
     ELSEIF(WIN32)
-      SET (osdir "xerces-c/lib")
+      IF (${ARCH64BIT} EQUAL 1)
+        SET (osdir "xerces-c/win64")
+      ELSE()
+        SET (osdir "xerces-c/win32")
+      ENDIF()
     ELSE()
       SET (osdir "unknown")
     ENDIF()
     IF (NOT ("${osdir}" STREQUAL "unknown"))
-      FIND_PATH (XERCES_INCLUDE_DIR NAMES xercesc/util/XercesDefs.hpp PATHS "${EXTERNALS_DIRECTORY}/xalan/xerces-c/include" NO_DEFAULT_PATH)
-      FIND_LIBRARY (XERCES_LIBRARIES NAMES ${xerces_libs} PATHS "${EXTERNALS_DIRECTORY}/xalan/${osdir}" NO_DEFAULT_PATH)
+      FIND_PATH (XERCES_INCLUDE_DIR NAMES xercesc/util/XercesDefs.hpp PATHS "${EXTERNALS_DIRECTORY}/xalan/${osdir}/include"
+              "${EXTERNALS_DIRECTORY}/xalan/xerces-c/include" NO_DEFAULT_PATH)
+      FIND_LIBRARY (XERCES_LIBRARIES NAMES ${xerces_libs} PATHS "${EXTERNALS_DIRECTORY}/xalan/${osdir}/lib" NO_DEFAULT_PATH)
     ENDIF() 
   ENDIF()
 
@@ -64,7 +65,7 @@ if (NOT XERCES_FOUND)
   )
 
   IF (XERCES_FOUND AND WIN32)
-    STRING(REPLACE "xerces-c_2" "xerces-c_2D" XERCES_DEBUG_LIBRARIES "${XERCES_LIBRARIES}")
+    STRING(REPLACE "xerces-c_3" "xerces-c_3D" XERCES_DEBUG_LIBRARIES "${XERCES_LIBRARIES}")
     set (XERCES_LIBRARIES optimized ${XERCES_LIBRARIES} debug ${XERCES_DEBUG_LIBRARIES})
   ENDIF()
   MARK_AS_ADVANCED(XERCES_INCLUDE_DIR XERCES_LIBRARIES)

cmake_modules/FindZLIB.cmake

@@ -39,11 +39,11 @@ IF (NOT ZLIB_FOUND)
       SET (zlibver "1.2.5")
     ELSEIF(WIN32)
       IF (${ARCH64BIT} EQUAL 1)
-        SET (osdir "win64")
+        SET (osdir "Win64")
       ELSE()
-        SET (osdir "win32")
+        SET (osdir "Win32")
       ENDIF()  
-      SET (zlibver "1.2.5")
+      SET (zlibver "1.2.8")
     ELSE()
       SET (osdir "unknown")
       SET (zlibver "unknown")

cmake_modules/commonSetup.cmake

@@ -180,12 +180,16 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
     STRING(REGEX REPLACE "/STACK:[0-9]+" "" CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
     SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
 
-    if (${ARCH64BIT} EQUAL 0)
-      add_definitions(/Zc:wchar_t-)
+    if (${ARCH64BIT} EQUAL 1)
+      add_definitions(/bigobj)
     endif ()
 
     if ("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
-      add_definitions(/ZI)
+      if (${ARCH64BIT} EQUAL 0)
+        add_definitions(/ZI)
+      else()
+        add_definitions(/Zi)
+      endif ()
     endif ()
     if ("${GIT_COMMAND}" STREQUAL "")
         set ( GIT_COMMAND "git.cmd" )
@@ -535,6 +539,9 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
         ELSE()
           message(FATAL_ERROR "CPPUNIT requested but package not found")
         ENDIF()
+      ELSE()
+        SET(CPPUNIT_INCLUDE_DIR "")
+        SET(CPPUNIT_LIBRARIES "")
       ENDIF(USE_CPPUNIT)
 
       IF (USE_ICU)
@@ -650,6 +657,7 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
         endif()
       else()
         add_definitions (-D_NO_MYSQL_REPOSITORY)
+        set(MYSQL_INCLUDE_DIR "")
       endif(USE_MYSQL_REPOSITORY)
 
       if(USE_APR)

common/deftype/deftype.hpp

@@ -33,9 +33,9 @@
 #define CHEAP_UCHAR_DEF
 #ifdef _WIN32
 typedef wchar_t UChar;
-#else //__WIN32
+#else //_WIN32
 typedef unsigned short UChar;
-#endif //__WIN32
+#endif //_WIN32
 
 interface ITypeInfo;
 interface IValue;

common/fileview2/fvrelate.hpp

@@ -23,9 +23,9 @@
 #define CHEAP_UCHAR_DEF
 #ifdef _WIN32
 typedef wchar_t UChar;
-#else //__WIN32
+#else //_WIN32
 typedef unsigned short UChar;
-#endif //__WIN32
+#endif //_WIN32
 
 typedef void (*stringFieldTransformerFunction)(unsigned & tgtLen, char * & tgt, unsigned srcLen, const char * src);
 typedef void (*utf8FieldTransformerFunction)(unsigned & tgtLen, char * & tgt, unsigned srcLen, const char * src);

common/workunit/workunit.hpp

@@ -44,9 +44,9 @@
 #define CHEAP_UCHAR_DEF
 #ifdef _WIN32
 typedef wchar_t UChar;
-#else //__WIN32
+#else //_WIN32
 typedef unsigned short UChar;
-#endif //__WIN32
+#endif //_WIN32
 
 
 // error codes

lib2/CMakeLists.txt

@@ -27,9 +27,9 @@ elseif (WIN32)
     #TODO:  Should find these dlls not assume them.
     if (NOT USE_NATIVE_LIBRARIES)
       if (${ARCH64BIT} EQUAL 1)
-        find_file (BOOST_REGEX_BIN "boost_regex-vc100-mt-1_46.dll" "${EXTERNALS_DIRECTORY}/boost/windows-x86_64-vc100/lib" NO_DEFAULT_PATH)
+        find_file (BOOST_REGEX_BIN "boost_regex-vc90-mt-1_57.dll" "${EXTERNALS_DIRECTORY}/boost/windows-x86_64-vc90/lib" NO_DEFAULT_PATH)
       else()
-        find_file (BOOST_REGEX_BIN "boost_regex-vc90-mt-1_44.dll" "${EXTERNALS_DIRECTORY}/boost/windows-i386-vc90/lib" NO_DEFAULT_PATH)
+        find_file (BOOST_REGEX_BIN "boost_regex-vc90-mt-1_57.dll" "${EXTERNALS_DIRECTORY}/boost/windows-i386-vc90/lib" NO_DEFAULT_PATH)
       endif()
     endif (NOT USE_NATIVE_LIBRARIES)
     if (${ARCH64BIT} EQUAL 1)
@@ -38,18 +38,18 @@ elseif (WIN32)
       find_file (ICU_UC_BIN "icuuc54.dll" "${EXTERNALS_DIRECTORY}/icu/bin64" NO_DEFAULT_PATH)
       find_file (OPENSSL_LIB_BIN "libeay32.dll" "${EXTERNALS_DIRECTORY}/openssl/win64/lib" NO_DEFAULT_PATH)
       find_file (OPENSSL_SSL_BIN "ssleay32.dll" "${EXTERNALS_DIRECTORY}/openssl/win64/lib" NO_DEFAULT_PATH)
-      find_file (XALAN_C_BIN "Xalan-C_1_11.dll" "${EXTERNALS_DIRECTORY}/xalan/xalan-c/bin" NO_DEFAULT_PATH)
-      find_file (XALAN_MESSAGES_BIN "XalanMessages_1_11.dll" "${EXTERNALS_DIRECTORY}/xalan/xalan-c/bin" NO_DEFAULT_PATH)
-      find_file (XERCES_C_BIN "xerces-c_3_1.dll" "${EXTERNALS_DIRECTORY}/xalan/xerces-c/bin" NO_DEFAULT_PATH)
+      find_file (XALAN_C_BIN "Xalan-C_1_11.dll" "${EXTERNALS_DIRECTORY}/xalan/xalan-c/win64/bin" NO_DEFAULT_PATH)
+      find_file (XALAN_MESSAGES_BIN "XalanMessages_1_11.dll" "${EXTERNALS_DIRECTORY}/xalan/xalan-c/win64/bin" NO_DEFAULT_PATH)
+      find_file (XERCES_C_BIN "xerces-c_3_1.dll" "${EXTERNALS_DIRECTORY}/xalan/xerces-c/win64/bin" NO_DEFAULT_PATH)
     else()
-      find_file (ICU_DT_BIN "icudt36.dll" "${EXTERNALS_DIRECTORY}/icu/bin" NO_DEFAULT_PATH)
-      find_file (ICU_IN_BIN "icuin36.dll" "${EXTERNALS_DIRECTORY}/icu/bin" NO_DEFAULT_PATH)
-      find_file (ICU_UC_BIN "icuuc36.dll" "${EXTERNALS_DIRECTORY}/icu/bin" NO_DEFAULT_PATH)
+      find_file (ICU_DT_BIN "icudt54.dll" "${EXTERNALS_DIRECTORY}/icu/bin" NO_DEFAULT_PATH)
+      find_file (ICU_IN_BIN "icuin54.dll" "${EXTERNALS_DIRECTORY}/icu/bin" NO_DEFAULT_PATH)
+      find_file (ICU_UC_BIN "icuuc54.dll" "${EXTERNALS_DIRECTORY}/icu/bin" NO_DEFAULT_PATH)
       find_file (OPENSSL_LIB_BIN "libeay32.dll" "${EXTERNALS_DIRECTORY}/openssl/win32/lib" NO_DEFAULT_PATH)
       find_file (OPENSSL_SSL_BIN "ssleay32.dll" "${EXTERNALS_DIRECTORY}/openssl/win32/lib" NO_DEFAULT_PATH)
-      find_file (XALAN_C_BIN "Xalan-C_1_10.dll" "${EXTERNALS_DIRECTORY}/xalan/xalan-c/bin" NO_DEFAULT_PATH)
-        find_file (XALAN_MESSAGES_BIN "XalanMessages_1_10.dll" "${EXTERNALS_DIRECTORY}/xalan/xalan-c/bin" NO_DEFAULT_PATH)
-        find_file (XERCES_C_BIN "xerces-c_2_7.dll" "${EXTERNALS_DIRECTORY}/xalan/xerces-c/bin" NO_DEFAULT_PATH)
+      find_file (XALAN_C_BIN "Xalan-C_1_11.dll" "${EXTERNALS_DIRECTORY}/xalan/xalan-c/win32/bin" NO_DEFAULT_PATH)
+      find_file (XALAN_MESSAGES_BIN "XalanMessages_1_11.dll" "${EXTERNALS_DIRECTORY}/xalan/xalan-c/win32/bin" NO_DEFAULT_PATH)
+      find_file (XERCES_C_BIN "xerces-c_3_1.dll" "${EXTERNALS_DIRECTORY}/xalan/xerces-c/win32/bin" NO_DEFAULT_PATH)
     endif()
 
     set(DYLIBS "")

rtl/eclrtl/eclinclude4.hpp

@@ -46,11 +46,11 @@
 #include <math.h>
 
 #define CHEAP_UCHAR_DEF
-#if __WIN32
+#if _WIN32
 typedef wchar_t UChar;
-#else //__WIN32
+#else //_WIN32
 typedef unsigned short UChar;
-#endif //__WIN32
+#endif //_WIN32
 
 #ifdef _WIN32
 typedef unsigned int size32_t; // avoid pulling in platform.h (which pulls in windows.h etc) just for this...

system/jhtree/jhtree.hpp

@@ -151,9 +151,9 @@ extern jhtree_decl void clearNodeStats();
 #define CHEAP_UCHAR_DEF
 #ifdef _WIN32
 typedef wchar_t UChar;
-#else //__WIN32
+#else //_WIN32
 typedef unsigned short UChar;
-#endif //__WIN32
+#endif //_WIN32
 #include "rtlkey.hpp"
 #include "jmisc.hpp"