Resolve stray VC8 CRT dependency by updating libs

indra/cmake/00-Common.cmake

@@ -103,6 +103,13 @@ if (WINDOWS)
 	    set(MSVC_DIR 10.0)
 	    set(MSVC_SUFFIX 100)
     endif (MSVC71)
+
+  if (MSVC10)
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
+    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO")
+    SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO")
+  endif(MSVC10)
+
     
 endif (WINDOWS)
 

indra/cmake/FindMT.cmake

@@ -1,15 +1,17 @@
-#Find the windows manifest tool.
-
-FIND_PROGRAM(HAVE_MANIFEST_TOOL NAMES mt
-                 PATHS
-                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/VC/bin"
-                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin"
-                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin")
-IF(HAVE_MANIFEST_TOOL)
-    MESSAGE(STATUS "Found Mainfest Tool. Embedding custom manifests.")
-ELSE(HAVE_MANIFEST_TOOL)
-    MESSAGE(FATAL_ERROR "Manifest tool, mt.exe, can't be found.")
-ENDIF(HAVE_MANIFEST_TOOL)
-
-STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS 
-      ${CMAKE_EXE_LINKER_FLAGS})
+#Find the windows manifest tool.
+if (MSVC80)
+  FIND_PROGRAM(HAVE_MANIFEST_TOOL NAMES mt
+                   PATHS
+                   "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/VC/bin"
+                   "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin"
+                   "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin")
+  IF(HAVE_MANIFEST_TOOL)
+      MESSAGE(STATUS "Found Mainfest Tool. Embedding custom manifests.")
+  ELSE(HAVE_MANIFEST_TOOL)
+      MESSAGE(FATAL_ERROR "Manifest tool, mt.exe, can't be found.")
+  ENDIF(HAVE_MANIFEST_TOOL)
+
+  STRING(REPLACE "/MANIFEST " "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS 
+      ${CMAKE_EXE_LINKER_FLAGS})
+
+endif (MSVC80)

indra/cmake/PNG.cmake

@@ -8,6 +8,10 @@ if (STANDALONE)
   include(FindPNG)
 else (STANDALONE)
   use_prebuilt_binary(libpng)
-  set(PNG_LIBRARIES png12)
+  if (WINDOWS)
+    set(PNG_LIBRARIES libpng15)
+  else (WINDOWS)
+    set(PNG_LIBRARIES png12)
+  endif (WINDOWS)
   set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)

indra/cmake/XmlRpcEpi.cmake

@@ -8,10 +8,6 @@ if (STANDALONE)
   include(FindXmlRpcEpi)
 else (STANDALONE)
     use_prebuilt_binary(xmlrpc-epi)
-    if (WINDOWS)
-        set(XMLRPCEPI_LIBRARIES xmlrpcepi)
-    else (WINDOWS)
-        set(XMLRPCEPI_LIBRARIES xmlrpc-epi)
-    endif (WINDOWS)
+    set(XMLRPCEPI_LIBRARIES xmlrpc-epi)
     set(XMLRPCEPI_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)