Merge from V6_main 06/03/2013

diff --git a/adm/cmake/FindEXPAT.cmake b/adm/cmake/FindEXPAT.cmake
index 8029b08514b85e0e3cc1c130d6199e3b1b4ee757..8a1b3d4fec746a071392ced80d5aa3e161b90072 100644 (file)
--- a/adm/cmake/FindEXPAT.cmake
+++ b/adm/cmake/FindEXPAT.cmake
@@ -19,7 +19,7 @@
 
 IF(WINDOWS)
   SET(EXPATHOME $ENV{EXPATHOME})
-  FIND_LIBRARY(EXPAT_LIB libexpat PATHS ${EXPATHOME}/bin ${EXPATHOME}/Bin)
+  FIND_LIBRARY(EXPAT_LIB libexpat HINTS ${EXPATHOME}/bin ${EXPATHOME}/Bin)
   FIND_PATH(EXPAT_INCLUDE_DIR expat.h PATHS ${EXPATHOME}/include ${EXPATHOME}/Source/lib)
 ELSE(WINDOWS)
   FIND_LIBRARY(EXPAT_LIB expat)

diff --git a/adm/cmake/FindGRAPHVIZ.cmake b/adm/cmake/FindGRAPHVIZ.cmake
index e242283a5883b5045483bf6e54914d66ad9111f9..96a6bf44aeb6a8eecc8ccb2ee052a9869ee89898 100644 (file)
--- a/adm/cmake/FindGRAPHVIZ.cmake
+++ b/adm/cmake/FindGRAPHVIZ.cmake
@@ -21,9 +21,16 @@ SET(GRAPHVIZ_LIBS)
 IF(WINDOWS)
   SET(GRAPHVIZHOME $ENV{GRAPHVIZHOME})
   FIND_PATH(GRAPHVIZ_INCLUDE_DIR gvc.h ${GRAPHVIZHOME}/include/graphviz)
-  FIND_LIBRARY(GVC_LIB gvc ${GRAPHVIZHOME}/bin)
+
+  SET(GRAPHVIZBIN ${GRAPHVIZHOME}/bin)
+  IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")          # if platform is Windows 64 bit 
+    SET(GRAPHVIZBIN ${GRAPHVIZBIN}/x64)
+  ENDIF()
+
+  FIND_LIBRARY(GVC_LIB gvc HINTS "${GRAPHVIZBIN}")
   SET(GRAPHVIZ_LIBS ${GRAPHVIZ_LIBS} ${GVC_LIB})
-  FIND_LIBRARY(GRAPH_LIB graph ${GRAPHVIZHOME}/bin)
+
+  FIND_LIBRARY(GRAPH_LIB graph HINTS "${GRAPHVIZBIN}")
   SET(GRAPHVIZ_LIBS ${GRAPHVIZ_LIBS} ${GRAPH_LIB})
 ELSE(WINDOWS)
   SET(GRAPHVIZHOME $ENV{GRAPHVIZHOME})