X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FFindWxWidgetsWin32.cmake;h=e7541fb5796610efd4ad28687b9a113ab36d4c60;hb=dfde248b7e6bb2c1706a6b1229a17ee2aa19ed9c;hp=f497736f24a8408d7ede6c05bd4d234b3472ef23;hpb=6167a8a1df98c0f05b1d614f709cc2f578cddab8;p=crea.git

diff --git a/cmake/FindWxWidgetsWin32.cmake b/cmake/FindWxWidgetsWin32.cmake
index f497736..e7541fb 100644
--- a/cmake/FindWxWidgetsWin32.cmake
+++ b/cmake/FindWxWidgetsWin32.cmake
@@ -127,12 +127,29 @@ SET(WXWIDGETS_CONFIG_PATH ${WXWIDGETS_ROOT_DIR})
 #
 IF( WIN32_STYLE_FIND )
 
-    IF( WXWIDGETS_USE_SHARED )
+# EED 31 jan 2013
+#		IF( WXWIDGETS_USE_SHARED )
+#        SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_dll" )
+#		ELSE( WXWIDGETS_USE_SHARED )
+#        SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_lib" )
+#		ENDIF( WXWIDGETS_USE_SHARED )
+
+  IF (CMAKE_CL_64)  ## EED 31 jan 2012
+		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_amd_lib" )
+		ENDIF( WXWIDGETS_USE_SHARED )
+	ELSE(CMAKE_CL_64)
+		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_CL_64)
+	
     SET( WXWIDGETS_LINK_DIRECTORIES ${WXWIDGETS_LIB_PATH} )
+	
 
 ELSE( WIN32_STYLE_FIND )
   IF (UNIX_STYLE_FIND)