ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: * properly detect 64 bits stuff... 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4644 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut@gmail.com 2011-05-10 16:22:28 +00:00
parent 47aeca4c75
commit 6f9ad58cdf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/SearchForStuff.cmake
View File

@ -167,7 +167,7 @@ if(wxWidgets_FOUND)
if(Linux) if(Linux)
# Force the use of 32 bit library configuration on # Force the use of 32 bit library configuration on
# 64 bits machine with 32 bits library in /usr/lib32 # 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") if (EXISTS "/usr/lib32")
# Debian/ubuntu. 64b in /usr/lib and 32b in /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}") 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 # 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}") STRING(REGEX REPLACE "/usr/lib64/wx" "/usr/lib/wx" wxWidgets_INCLUDE_DIRS "${wxWidgets_INCLUDE_DIRS}")
endif (EXISTS "/usr/lib") endif (EXISTS "/usr/lib")
endif(CMAKE_SIZEOF_VOID_P MATCHES "8" AND EXISTS "/usr/lib32") endif(CMAKE_SIZEOF_VOID_P MATCHES "8")
endif(Linux) endif(Linux)
include(${wxWidgets_USE_FILE}) include(${wxWidgets_USE_FILE})