Migrated to vs 2013 (v120) and updated libxml2 to v 2.9.

Author: Will Sobel

.gitignore

@@ -6,3 +6,4 @@ Release
 *.suo
 *.ncb
 *.user
+test/agent.log*

agent/CMakeLists.txt

@@ -13,28 +13,30 @@ set (AGENT_VERSION_BUILD 0)
 set (AGENT_VERSION_RC "_RC17")
 
 if(WIN32)
-  # For windows XP use: cmake -G "Visual Studio 11" -T v110_xp -D WINVER=0x0501
+  # For windows XP use: cmake -G "Visual Studio 12" -T v120_xp -D WINVER=0x0501
   # for XP targeting
-  # For windows Vista+ use: cmake -G "Visual Studio 11" -T v110 -D WINVER=0x0601
+  # For windows Vista+ use: cmake -G "Visual Studio 12" -T v120 -D WINVER=0x0601
   # for XP targeting
 
   if(CMAKE_CL_64)
+    set(bits 64)
     foreach(flag_var
           CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
           CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
       if(${flag_var} MATCHES "WIN32")
         string(REGEX REPLACE "32" "64" ${flag_var} "${${flag_var}}")
       endif(${flag_var} MATCHES "WIN32")
-    endforeach(flag_var)
-          
-    file(GLOB LibXML2_LIBRARIES ../win32/libxml2-2.7.7/lib/libxml2_64.lib)
-    file(GLOB LibXML2_DEBUG_LIBRARIES ../win32/libxml2-2.7.7/lib/libxml2_64d.lib)
+    endforeach(flag_var)          
   else(CMAKE_CL_64)
-    file(GLOB LibXML2_LIBRARIES ../win32/libxml2-2.7.7/lib/libxml2.lib)
-    file(GLOB LibXML2_DEBUG_LIBRARIES ../win32/libxml2-2.7.7/lib/libxml2d.lib)
-  endif(CMAKE_CL_64)
+    set(bits 32)
+  endif(CMAKE_CL_64)  
+  
+  file(GLOB LibXML2_LIBRARIES "../win32/libxml2-2.9/lib/libxml2_a_v120_${bits}.lib")
+  file(GLOB LibXML2_DEBUG_LIBRARIES ../win32/libxml2-2.9/lib/libxml2d_a_v120_${bits}.lib)
+    
   add_library(libxml2 STATIC IMPORTED)
-  set(LibXML2_INCLUDE_DIRS ../win32/libxml2-2.7.7/include )
+  set(LibXML2_INCLUDE_DIRS ../win32/libxml2-2.9/include )
+  
   set_property(TARGET libxml2 PROPERTY IMPORTED_LOCATION_RELEASE ${LibXML2_LIBRARIES})
   set_property(TARGET libxml2 PROPERTY IMPORTED_LOCATION_DEBUG ${LibXML2_DEBUG_LIBRARIES})
 endif(WIN32)

agent/service.cpp

@@ -163,8 +163,6 @@ void MTConnectService::install()
   SC_HANDLE manager;
   SC_HANDLE service;
   char path[MAX_PATH];
-  char *commandLine;
-
 
   if( !GetModuleFileName(NULL, path, MAX_PATH ) )
   {

test/CMakeLists.txt

@@ -7,10 +7,19 @@ set(CMAKE_FIND_FRAMEWORK NEVER FORCE)
 set(CMAKE_FIND_APPBUNDLE NEVER)
 
 if(WIN32)
-  set(LibXML2_INCLUDE_DIRS ../win32/libxml2-2.7.7/include )
-  file(GLOB LibXML2_LIBRARIES ../win32/libxml2-2.7.7/lib/libxml2_a_dll.lib )
+  set(LibXML2_INCLUDE_DIRS ../win32/libxml2-2.9/include )
+  
+  if(CMAKE_CL_64)
+    set(bits 64)
+  else(CMAKE_CL_64)
+  set(bits 32)
+  endif(CMAKE_CL_64)
+  
+  file(GLOB LibXML2_LIBRARIES "../win32/libxml2-2.9/lib/libxml2_a_v120_${bits}.lib")
+  file(GLOB LibXML2_DEBUG_LIBRARIES ../win32/libxml2-2.9/lib/libxml2d_a_v120_${bits}.lib)
+
   set(CPPUNIT_INCLUDE_DIR ../win32/cppunit-1.12.1/include)
-  file(GLOB CPPUNIT_LIBRARY ../win32/cppunit-1.12.1/lib/cppunitd_dll.lib)
+  file(GLOB CPPUNIT_LIBRARY ../win32/cppunit-1.12.1/lib/cppunitd_v120_a.lib)
 endif(WIN32)
 
 if(UNIX)
@@ -74,6 +83,14 @@ include_directories(${LibXML2_INCLUDE_DIRS} ${CPPUNIT_INCLUDE_DIR})
 if(WIN32)
   set(WINVER "0x0501" CACHE STRING "Win32 API Target version (see http://msdn.microsoft.com/en-us/library/aa383745%28v=VS.85%29.aspx)")
   add_definitions("/DWINVER=${WINVER}" "/D_WIN32_WINNT=${WINVER}")
+  
+  foreach(flag_var
+          CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
+          CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+     if(${flag_var} MATCHES "/MD")
+        string(REGEX REPLACE "/MD[d]?" "/MTd" ${flag_var} "${${flag_var}}")
+     endif(${flag_var} MATCHES "/MD")
+  endforeach(flag_var)
 endif(WIN32)
 
 add_executable(agent_test ${test_srcs} ${test_headers})