From c0b0dd1f06fefd2f2e44ef3bc31d3027de82c5c6 Mon Sep 17 00:00:00 2001 From: w1z7ard Date: Tue, 29 Jan 2008 00:23:43 +0000 Subject: [PATCH] made qprojectM-* new conditional reference style (they don't work yet though?) git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@806 6778bc44-b910-0410-a7a0-be141de4315d --- src/qprojectM-jack/CMakeLists.txt | 16 ++++++++++++++-- src/qprojectM-pulseaudio/CMakeLists.txt | 15 +++++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/qprojectM-jack/CMakeLists.txt b/src/qprojectM-jack/CMakeLists.txt index e07853011..4c2169b42 100644 --- a/src/qprojectM-jack/CMakeLists.txt +++ b/src/qprojectM-jack/CMakeLists.txt @@ -32,9 +32,21 @@ ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${PROJECTM_PREFIX}"') ADD_DEFINITIONS(${QT_DEFINITIONS}) ADD_DEFINITIONS(-DQT_NO_DEBUG) -INCLUDE_DIRECTORIES(${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine ${PROJECTM_ROOT_SOURCE_DIR}/qprojectM ${JACK_INCLUDEDIR} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}) -LINK_DIRECTORIES(${PROJECTM_ROOT_BINARY_DIR}/projectM-engine ${PROJECTM_ROOT_BINARY_DIR}/qprojectM ${JACK_LDFLAGS}) +if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") + set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine ${PROJECTM_ROOT_SOURCE_DIR}/qprojectM) + set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine ${PROJECTM_ROOT_BINARY_DIR}/qprojectM) +elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) + set(PROJECTM_INCLUDE ${PROJECTM_INCLUDEDIR}/libprojectM) + set(PROJECTM_LINK ${PROJECTM_LDFLAGS}) + # qprojectM places itself in same location as (lib)projectM + # whether it should is a whole other issue +endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") + + +INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${JACK_INCLUDEDIR} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}) + +LINK_DIRECTORIES(${PROJECTM_LINK} ${JACK_LDFLAGS}) ADD_EXECUTABLE(qprojectM-jack ${qprojectM_jack_SRCS} ${qprojectM_jack_MOC_SRCS}) diff --git a/src/qprojectM-pulseaudio/CMakeLists.txt b/src/qprojectM-pulseaudio/CMakeLists.txt index 3b1d26e20..eaea9bcaa 100644 --- a/src/qprojectM-pulseaudio/CMakeLists.txt +++ b/src/qprojectM-pulseaudio/CMakeLists.txt @@ -33,9 +33,20 @@ ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${PROJECTM_PREFIX}"') ADD_DEFINITIONS(${QT_DEFINITIONS}) ADD_DEFINITIONS(-DQT_NO_DEBUG) -INCLUDE_DIRECTORIES(${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine ${PROJECTM_ROOT_SOURCE_DIR}/qprojectM ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}) -LINK_DIRECTORIES(${PROJECTM_ROOT_BINARY_DIR}/projectM-engine ${PROJECTM_ROOT_BINARY_DIR}/qprojectM ${PROJECTM_LDFLAGS} ${PULSEAUDIO_LDFLAGS}) +if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") + set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine ${PROJECTM_ROOT_SOURCE_DIR}/qprojectM) + set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine ${PROJECTM_ROOT_BINARY_DIR}/qprojectM) +elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) + set(PROJECTM_INCLUDE ${PROJECTM_INCLUDEDIR}/libprojectM) + set(PROJECTM_LINK ${PROJECTM_LDFLAGS}) +# qprojectM places itself in same location as (lib)projectM +# whether it should is a whole other issue +endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") + +INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}) + +LINK_DIRECTORIES(${PROJECTM_LINK} ${PULSEAUDIO_LDFLAGS}) ADD_EXECUTABLE(qprojectM-pulseaudio ${qprojectM_pulseaudio_SRCS} ${qprojectM_pulseaudio_MOC_SRCS} ${qprojectM_pulseaudio_UIS_H})