DFCH: wxWidgets find in windows x64

diff --git a/cmake/FindWxWidgetsWin32.cmake b/cmake/FindWxWidgetsWin32.cmake
index f497736f24a8408d7ede6c05bd4d234b3472ef23..3941224bb3807e0dd5fba081ba7221ee05e070af 100644 (file)
--- a/cmake/FindWxWidgetsWin32.cmake
+++ b/cmake/FindWxWidgetsWin32.cmake
@@ -127,11 +127,20 @@ SET(WXWIDGETS_CONFIG_PATH ${WXWIDGETS_ROOT_DIR})
 #
 IF( WIN32_STYLE_FIND )
 
-    IF( WXWIDGETS_USE_SHARED )
+    #DFCH: If x64 architecture
+       IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+               IF( WXWIDGETS_USE_SHARED )
+        SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_amd64_dll" )
+               ELSE( WXWIDGETS_USE_SHARED )
+        SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_amd64_lib" )
+               ENDIF( WXWIDGETS_USE_SHARED )
+       ELSE (CMAKE_SIZEOF_VOID_P EQUAL 8)
+               IF( WXWIDGETS_USE_SHARED )
         SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_dll" )
-    ELSE( WXWIDGETS_USE_SHARED )
+               ELSE( WXWIDGETS_USE_SHARED )
         SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_lib" )
-    ENDIF( WXWIDGETS_USE_SHARED )
+               ENDIF( WXWIDGETS_USE_SHARED )
+       ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 8)
     SET( WXWIDGETS_LINK_DIRECTORIES ${WXWIDGETS_LIB_PATH} )
 
 ELSE( WIN32_STYLE_FIND )