From 6f9ad58cdf7eb6fd6e6e82fbd6efd13b79764677 Mon Sep 17 00:00:00 2001 From: "gregory.hainaut@gmail.com" Date: Tue, 10 May 2011 16:22:28 +0000 Subject: [PATCH] cmake: * properly detect 64 bits stuff... git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4644 96395faa-99c1-11dd-bbfe-3dabce05a288 --- cmake/SearchForStuff.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake index 6b104f9f5d..53099225b5 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake @@ -167,7 +167,7 @@ if(wxWidgets_FOUND) if(Linux) # Force the use of 32 bit library configuration on # 64 bits machine with 32 bits library in /usr/lib32 - if(CMAKE_SIZEOF_VOID_P MATCHES "8" AND EXISTS "/usr/lib32") + if(CMAKE_SIZEOF_VOID_P MATCHES "8") if (EXISTS "/usr/lib32") # Debian/ubuntu. 64b in /usr/lib and 32b in /usr/lib32 STRING(REGEX REPLACE "/usr/lib/wx" "/usr/lib32/wx" wxWidgets_INCLUDE_DIRS "${wxWidgets_INCLUDE_DIRS}") @@ -178,7 +178,7 @@ if(wxWidgets_FOUND) # Fedora/Open suse. 64b in /usr/lib64 and 32b in /usr/lib STRING(REGEX REPLACE "/usr/lib64/wx" "/usr/lib/wx" wxWidgets_INCLUDE_DIRS "${wxWidgets_INCLUDE_DIRS}") endif (EXISTS "/usr/lib") - endif(CMAKE_SIZEOF_VOID_P MATCHES "8" AND EXISTS "/usr/lib32") + endif(CMAKE_SIZEOF_VOID_P MATCHES "8") endif(Linux) include(${wxWidgets_USE_FILE})