From c02fb550364242320da40db9184ad80aa1f1ce52 Mon Sep 17 00:00:00 2001 From: Diego Caceres Date: Tue, 10 Jul 2012 11:16:53 +0000 Subject: [PATCH] DFCH: wxWidgets find in windows x64 --- cmake/FindWxWidgetsWin32.cmake | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/cmake/FindWxWidgetsWin32.cmake b/cmake/FindWxWidgetsWin32.cmake index f497736..3941224 100644 --- 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 ) -- 2.46.1