X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FFindWxWidgetsWin32.cmake;h=e7541fb5796610efd4ad28687b9a113ab36d4c60;hb=a6e8677c636898738b30193a367263610f7a49a2;hp=3941224bb3807e0dd5fba081ba7221ee05e070af;hpb=c02fb550364242320da40db9184ad80aa1f1ce52;p=crea.git

diff --git a/cmake/FindWxWidgetsWin32.cmake b/cmake/FindWxWidgetsWin32.cmake
index 3941224..e7541fb 100644
--- a/cmake/FindWxWidgetsWin32.cmake
+++ b/cmake/FindWxWidgetsWin32.cmake
@@ -127,21 +127,29 @@ SET(WXWIDGETS_CONFIG_PATH ${WXWIDGETS_ROOT_DIR})
 #
 IF( WIN32_STYLE_FIND )
 
-    #DFCH: If x64 architecture
-	IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+# 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_amd64_lib" )
+        SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_amd_lib" )
 		ENDIF( WXWIDGETS_USE_SHARED )
-	ELSE (CMAKE_SIZEOF_VOID_P EQUAL 8)
+	ELSE(CMAKE_CL_64)
 		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 )
-	ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 8)
+	ENDIF(CMAKE_CL_64)
+	
     SET( WXWIDGETS_LINK_DIRECTORIES ${WXWIDGETS_LIB_PATH} )
+	
 
 ELSE( WIN32_STYLE_FIND )
   IF (UNIX_STYLE_FIND)