diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d8225255..c00d5a758 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,9 +55,6 @@ endif(WIN32) find_library(LASTFM_LIBRARIES lastfm) find_path(LASTFM_INCLUDE_DIRS lastfm/ws.h) -find_library(PROJECTM_LIBRARIES projectM) -find_path(PROJECTM_INCLUDE_DIRS libprojectM/projectM.hpp) - if (APPLE) find_library(GROWL Growl) find_library(SPARKLE Sparkle) @@ -118,6 +115,7 @@ if (NOT APPLE) add_subdirectory(3rdparty/qxt) endif (NOT APPLE) add_subdirectory(3rdparty/universalchardet) +add_subdirectory(3rdparty/libprojectm) add_subdirectory(tests) add_subdirectory(dist) diff --git a/src/visualisations/CMakeLists.txt b/src/visualisations/CMakeLists.txt index 4b3e9eeec..567077183 100644 --- a/src/visualisations/CMakeLists.txt +++ b/src/visualisations/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.6) include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) -include_directories(${PROJECTM_INCLUDE_DIRS}) +include_directories("../../3rdparty/libprojectm") set(SOURCES projectmvisualisation.cpp @@ -31,7 +31,7 @@ add_library(clementine_visualisations target_link_libraries(clementine_visualisations clementine_core clementine_engines - ${PROJECTM_LIBRARIES} + projectM ) add_translation_source(visualisations ${SOURCES} ${MOC} ${UIC})