From 7fe835b3e47a15e35fea2f119604b606fe77adcb Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 12 Sep 2013 15:46:26 +0000 Subject: fixed name of projectm configuration variable git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3711 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Visual/projectm/CMakeLists.txt | 10 +++++----- src/plugins/Visual/projectm/projectm.pro | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/plugins/Visual/projectm/CMakeLists.txt b/src/plugins/Visual/projectm/CMakeLists.txt index ca321d79d..75d296ee9 100644 --- a/src/plugins/Visual/projectm/CMakeLists.txt +++ b/src/plugins/Visual/projectm/CMakeLists.txt @@ -39,13 +39,13 @@ IF(PROJECTM_20_FOUND) ADD_DEFINITIONS(-DPROJECTM_20) ENDIF(PROJECTM_20_FOUND) -find_file(PROJECTM_CONFIG_FILE config.inp +find_file(PROJECTM_CONFIG config.inp PATHS "/usr/share/projectM/" "/usr/local/share/projectM/") -IF(PROJECTM_CONFIG_FILE) -ADD_DEFINITIONS(-DPROJECTM_CONFIG_FILE=\\\"${PROJECTM_CONFIG_FILE}\\\") -MESSAGE(STATUS "Found projectM configuration: ${PROJECTM_CONFIG_FILE}") -ENDIF(PROJECTM_CONFIG_FILE) +IF(PROJECTM_CONFIG) +ADD_DEFINITIONS(-DPROJECTM_CONFIG=\\\"${PROJECTM_CONFIG}\\\") +MESSAGE(STATUS "Found projectM configuration: ${PROJECTM_CONFIG}") +ENDIF(PROJECTM_CONFIG) SET(libprojectm_SRCS projectmwidget.cpp diff --git a/src/plugins/Visual/projectm/projectm.pro b/src/plugins/Visual/projectm/projectm.pro index 1da0c7999..71197cb10 100644 --- a/src/plugins/Visual/projectm/projectm.pro +++ b/src/plugins/Visual/projectm/projectm.pro @@ -56,6 +56,6 @@ PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \ for(path, PROJECTM_CONFIG_FILES) { exists($$path) { message ("found projectm configuration: "$$path) - DEFINES += PROJECTM_CONFIG_FILE=\\\"$$path\\\" + DEFINES += PROJECTM_CONFIG=\\\"$$path\\\" } } -- cgit v1.2.3-13-gbd6f