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

cmake: drop gtk workaround for ubuntu 10.10 

Note: remove also FIND_LIBRARY_USE_LIB64_PATHS that is alredy set in build parameter
This commit is contained in:
Gregory Hainaut 2014-07-30 00:04:08 +02:00
parent f38c6d0995
commit cc0b9bbca9
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmake/SearchForStuff.cmake
View File

@ -1,26 +1,9 @@
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Search all libraries on the system # Search all libraries on the system
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Do not search Lib in /usr/lib64. Hope it is not overwritten in find_package or others macro
SET(FIND_LIBRARY_USE_LIB64_PATHS FALSE)
## Linux only libraries
if(Linux) if(Linux)
# Most plugins (if not all) and PCSX2 core need gtk2, so set the required flags # Most plugins (if not all) and PCSX2 core need gtk2, so set the required flags
find_package(GTK2 REQUIRED gtk) find_package(GTK2 REQUIRED gtk)
if(GTK2_FOUND)
# From version 2.21.3 gtk moved gdk-pixbuf into a separate module
# Cmake need to be fixed. For the moment uses a manual detection.
find_path(GDK_PIXBUF_INCLUDE_DIRS NAMES gdk-pixbuf/gdk-pixbuf.h PATHS
/usr/include/gdk-pixbuf-2.0
/usr/include)
if (GDK_PIXBUF_INCLUDE_DIRS)
set(GTK2_INCLUDE_DIRS "${GDK_PIXBUF_INCLUDE_DIRS}" "${GTK2_INCLUDE_DIRS}")
# Remove duplicates when cmake will be fixed
list(REMOVE_DUPLICATES GTK2_INCLUDE_DIRS)
endif()
endif()
find_package(X11) find_package(X11)
endif() endif()