Feature 1905: New version v1_1_0

[crea.git] / cmake / FindWxWidgetsWin32.cmake

diff --git a/cmake/FindWxWidgetsWin32.cmake b/cmake/FindWxWidgetsWin32.cmake
index a03d731c41edfb810d3faf9daa39ff2a4cd10e9d..e7541fb5796610efd4ad28687b9a113ab36d4c60 100644 (file)
--- a/cmake/FindWxWidgetsWin32.cmake
+++ b/cmake/FindWxWidgetsWin32.cmake
@@ -83,8 +83,11 @@ IF(WIN32)
   SET(WIN32_STYLE_FIND 1)
 ENDIF(WIN32)
 IF(MINGW)
-  SET(WIN32_STYLE_FIND 0)
+  SET(WIN32_STYLE_FIND 1)
+  if(UNIX)
+    SET(WIN32_STYLE_FIND 0)
   SET(UNIX_STYLE_FIND 1)
+  endif(UNIX)
 ENDIF(MINGW)
 IF(UNIX)
   SET(UNIX_STYLE_FIND 1)
@@ -124,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)