From ae3b500259652d81f0d259348792abf646c8230c Mon Sep 17 00:00:00 2001 From: John Maguire Date: Thu, 17 Jun 2010 14:45:31 +0000 Subject: [PATCH] Make the buildsystem a little more robust. --- 3rdparty/libprojectm/CMakeLists.txt | 2 ++ CMakeLists.txt | 3 +++ src/CMakeLists.txt | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/3rdparty/libprojectm/CMakeLists.txt b/3rdparty/libprojectm/CMakeLists.txt index 671e066eb..cb1a853f3 100644 --- a/3rdparty/libprojectm/CMakeLists.txt +++ b/3rdparty/libprojectm/CMakeLists.txt @@ -28,6 +28,8 @@ if (USE_NATIVE_GLEW) else(USE_NATIVE_GLEW) SET(GLEW_SOURCES ) find_library(GLEW_LIBRARIES NAMES glew GLEW glew32) + find_path(GLEW_INCLUDE_DIRS GL/glew.h HINTS /sw/include) + include_directories(${GLEW_INCLUDE_DIRS}) endif(USE_NATIVE_GLEW) SET(projectM_SOURCES projectM.cpp PCM.cpp Preset.cpp fftsg.cpp KeyHandler.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index fde773f65..5d95d6305 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,6 +50,9 @@ else(WIN32) pkg_check_modules(GSTREAMER_BASE gstreamer-base-0.10) pkg_check_modules(LIBVLC libvlc) pkg_check_modules(LIBXINE libxine) + pkg_check_modules(GLIB glib-2.0) + pkg_check_modules(LIBXML libxml-2.0) + pkg_check_modules(GOBJECT gobject-2.0) endif(WIN32) find_library(LASTFM_LIBRARIES lastfm) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8921a6e0d..e9c637fae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,6 +11,10 @@ include_directories(../3rdparty/qtiocompressor) include_directories(../3rdparty/qxt) include_directories(../3rdparty/libprojectm) +include_directories(${GLIB_INCLUDE_DIRECTORIES}) +include_directories(${LIBXML_INCLUDE_DIRECTORIES}) +include_directories(${GOBJECT_INCLUDE_DIRECTORIES}) + cmake_policy(SET CMP0011 NEW) include(../cmake/AddEngine.cmake) include(../cmake/ParseArguments.cmake)