From 36a13b163fe11192715e05bf6f2f5acdbb1c6323 Mon Sep 17 00:00:00 2001 From: ximion Date: Sun, 1 Jan 2012 19:04:00 +0000 Subject: [PATCH] Fix projectM build process git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1368 6778bc44-b910-0410-a7a0-be141de4315d --- CMakeLists.txt | 3 +- src/CMakeLists.txt | 4 +- src/NativePresets/CMakeLists.txt | 12 ++--- src/libprojectM/CMakeLists.txt | 10 ++--- src/libprojectM/Renderer/CMakeLists.txt | 2 +- src/projectM-jack/CMakeLists.txt | 28 ++++++------ src/projectM-libvisual-alsa/CMakeLists.txt | 2 +- src/projectM-libvisual/CMakeLists.txt | 10 ++--- src/projectM-pulseaudio/CMakeLists.txt | 51 ++++++++++++---------- src/projectM-qt/CMakeLists.txt | 6 +-- src/projectM-test/CMakeLists.txt | 9 ++-- src/projectM-xmms/CMakeLists.txt | 10 ++--- 12 files changed, 77 insertions(+), 70 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 98b4633bd..dcda29d10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,5 +7,6 @@ if(COMMAND cmake_policy) endif(COMMAND cmake_policy) -Include(src/cmake/CPack-projectM.cmake) +include(src/cmake/CPack-projectM.cmake) +add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 038f5e34e..858cc4465 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -project (PROJECTM_ROOT) +project (projectM-complete) cmake_minimum_required(VERSION 2.4.0) @@ -11,6 +11,8 @@ OPTION(INCLUDE-PROJECTM-TEST "Build the projectM test suite" ON) OPTION(INCLUDE-PROJECTM-XMMS "Build the projectM xmms module (deprecated, use audacious instead)" OFF) OPTION(INCLUDE-NATIVE-PRESETS "Build the projectM native preset sample collection " ON) +set(PROJECTM_ROOT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + add_subdirectory (libprojectM) if(INCLUDE-PROJECTM-TEST) diff --git a/src/NativePresets/CMakeLists.txt b/src/NativePresets/CMakeLists.txt index 9a6e50664..0c246b27d 100644 --- a/src/NativePresets/CMakeLists.txt +++ b/src/NativePresets/CMakeLists.txt @@ -6,11 +6,11 @@ include(FindPkgConfig.cmake) Include(cmake/CPack-projectM.cmake) -if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") +if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") set(LIBPROJECTM_FOUND true) -else(${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") +else(${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") pkg_search_module(LIBPROJECTM REQUIRED libprojectM) -endif(${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") +endif(${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") if (LIBPROJECTM_FOUND) MESSAGE(STATUS "[NativePresets] projectM detected.") @@ -19,7 +19,7 @@ else (LIBPROJECTM_FOUND) endif(LIBPROJECTM_FOUND) -ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${PROJECTM_PREFIX}"') +ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${PROJECTM_PREFIX}\"') if(COMMAND cmake_policy) @@ -34,13 +34,13 @@ ADD_LIBRARY(MstressJuppyDancer SHARED MstressJuppyDancer.cpp) # Doesn't build yet #ADD_LIBRARY(RLGFractalDrop7c SHARED RLGFractalDrop7c.cpp) -if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") +if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM) set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM) elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM) set(PROJECTM_LINK ${PROJECTM_LDFLAGS}) -endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") +endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") LINK_DIRECTORIES(${PROJECTM_LINK} ${Renderer_BINARY_DIR} ${NativePresetFactory_BINARY_DIR}) diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt index 0abade4f0..e65f731ab 100644 --- a/src/libprojectM/CMakeLists.txt +++ b/src/libprojectM/CMakeLists.txt @@ -7,9 +7,7 @@ INCLUDE(cmake/CPack-projectM.cmake) cmake_policy(SET CMP0005 OLD) - -set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} - ${CMAKE_CURRENT_SOURCE_DIR}/cmake ) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) OPTION (USE_DEVIL "Use devIL for image loading rather than the builtin SOIL library" OFF) @@ -118,6 +116,8 @@ else(BUILD_PROJECTM_STATIC) ADD_LIBRARY(projectM SHARED ${projectM_SOURCES}) endif(BUILD_PROJECTM_STATIC) +set_property(TARGET projectM PROPERTY LINK_INTERFACE_LIBRARIES "") +set_property(TARGET projectM PROPERTY IMPORTED_LINK_DEPENDENT_LIBRARIES "") SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.00 SOVERSION 2) if (USE_THREADS) @@ -193,10 +193,10 @@ else(MSVC) endif(MSVC) if(BUILD_PROJECTM_STATIC) - TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} ${MATH_LIBRARIES} ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) + TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LIBRARY} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES}) else(BUILD_PROJECTM_STATIC) -TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} ${MATH_LIBRARIES} ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) +TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LIBRARY} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES} ) endif(BUILD_PROJECTM_STATIC) diff --git a/src/libprojectM/Renderer/CMakeLists.txt b/src/libprojectM/Renderer/CMakeLists.txt index af95cb158..fe98f7d8f 100644 --- a/src/libprojectM/Renderer/CMakeLists.txt +++ b/src/libprojectM/Renderer/CMakeLists.txt @@ -21,4 +21,4 @@ endif(MSVC) INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR}) ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES}) SET_TARGET_PROPERTIES(Renderer PROPERTIES VERSION 2.00 SOVERSION 2) -TARGET_LINK_LIBRARIES(Renderer ${MATH_LIBRARIES}) +TARGET_LINK_LIBRARIES(Renderer ${MATH_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE2_LIBRARIES}) diff --git a/src/projectM-jack/CMakeLists.txt b/src/projectM-jack/CMakeLists.txt index 3414d9ef4..ff4f4774e 100644 --- a/src/projectM-jack/CMakeLists.txt +++ b/src/projectM-jack/CMakeLists.txt @@ -18,17 +18,17 @@ include(${QT_USE_FILE} FindPkgConfig.cmake) if (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) pkg_search_module(LIBPROJECTM REQUIRED libprojectM) pkg_search_module(LIBPROJECTM-QT REQUIRED libprojectM-qt) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${LIBPROJECTM_PREFIX}"') + ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${LIBPROJECTM_PREFIX}\"') else(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(LIBPROJECTM_FOUND true) set(LIBPROJECTM-QT_FOUND true) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${CMAKE_INSTALL_PREFIX}"') + ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${CMAKE_INSTALL_PREFIX}\"') endif(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) if (APPLE) -ADD_DEFINITIONS(-DRESOURCE_PREFIX='"Resources"') +ADD_DEFINITIONS(-DRESOURCE_PREFIX='\"Resources\"') else (APPLE) -ADD_DEFINITIONS(-DRESOURCE_PREFIX='"share/projectM"') +ADD_DEFINITIONS(-DRESOURCE_PREFIX='\"share/projectM\"') endif (APPLE) FIND_PACKAGE(OpenGL) @@ -73,24 +73,24 @@ ADD_DEFINITIONS(${QT_DEFINITIONS}) ADD_DEFINITIONS(-DQT_NO_DEBUG) -if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") +if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM ${PROJECTM_ROOT_SOURCE_DIR}/projectM-qt) set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM ${PROJECTM_ROOT_BINARY_DIR}/projectM-qt) elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM-qt ${LIBPROJECTM-QT_INCLUDEDIR}/libprojectM) set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS} ${LIBPROJECTM-QT_LDFLAGS}) -# projectM-qt places itself in same location as (lib)projectM +# projectM-qt places itself in same location as (lib)projectM # whether it should is a whole other issue -endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") +endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") -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}) +INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${JACK_INCLUDEDIR} ${SDL_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}) LINK_DIRECTORIES(${PROJECTM_LINK} ${JACK_LDFLAGS}) if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) +endif(COMMAND cmake_policy) ADD_EXECUTABLE(projectM-jack ${projectM_jack_SRCS} ${projectM_jack_MOC_SRCS}) @@ -137,20 +137,18 @@ else(LIBPROJECTM_FOUND) MESSAGE (FATAL_ERROR "projectM NOT detected. Please install the projectM module or build from the top level projectM source directory.") endif(LIBPROJECTM_FOUND) -ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${PROJECTM_PREFIX}"') - -if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") +if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine) set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine) elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM) set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS}) -endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") +endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") -INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${JACK_INCLUDEDIR} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${JACK_INCLUDEDIR} ${SDL_INCLUDE_DIR}) LINK_DIRECTORIES(${PROJECTM_LINK} ${JACK_LDFLAGS}) -TARGET_LINK_LIBRARIES(projectM-jack projectM jack ${SDL_LIBRARY} ${GTK_LIBRARIES}) +TARGET_LINK_LIBRARIES(projectM-jack projectM jack ${SDL_LIBRARY}) INSTALL(TARGETS projectM-jack DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) install(FILES "projectM-jack.desktop" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) diff --git a/src/projectM-libvisual-alsa/CMakeLists.txt b/src/projectM-libvisual-alsa/CMakeLists.txt index b1c2f3088..0be6bf3bb 100644 --- a/src/projectM-libvisual-alsa/CMakeLists.txt +++ b/src/projectM-libvisual-alsa/CMakeLists.txt @@ -32,7 +32,7 @@ else(LIBVISUAL_FOUND) MESSAGE(FATAL_ERROR "libvisual 0.4 not found! Please visit http://libvisual.sf.net and download the module.") endif(LIBVISUAL_FOUND) -ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${PROJECTM_PREFIX}"') +ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${PROJECTM_PREFIX}\"') INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} ${LIBVISUAL_INCLUDEDIR} ${X11_INCLUDE_DIR}) diff --git a/src/projectM-libvisual/CMakeLists.txt b/src/projectM-libvisual/CMakeLists.txt index f9a947ab9..1ae1ce769 100644 --- a/src/projectM-libvisual/CMakeLists.txt +++ b/src/projectM-libvisual/CMakeLists.txt @@ -2,7 +2,7 @@ PROJECT(projectM_libvisual) cmake_minimum_required(VERSION 2.4.0) if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) - endif(COMMAND cmake_policy) + endif(COMMAND cmake_policy) INCLUDE(cmake/CPack-projectM.cmake) @@ -19,10 +19,10 @@ FIND_PACKAGE(SDL) if (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) pkg_search_module(LIBPROJECTM REQUIRED libprojectM) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${LIBPROJECTM_PREFIX}"') + ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${LIBPROJECTM_PREFIX}\"') else (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(LIBPROJECTM_FOUND true) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${CMAKE_INSTALL_PREFIX}"') + ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${CMAKE_INSTALL_PREFIX}\"') endif(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) ADD_DEFINITIONS(-DLINUX) @@ -43,13 +43,13 @@ endif(LIBVISUAL_FOUND) -if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") +if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM) set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM) elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM) set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS}) -endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") +endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${LIBVISUAL_INCLUDEDIR} ${SDL_INCLUDE_DIR}) LINK_DIRECTORIES(${PROJECTM_LINK} ${LIBVISUAL_LDFLAGS}) diff --git a/src/projectM-pulseaudio/CMakeLists.txt b/src/projectM-pulseaudio/CMakeLists.txt index b9cffe85b..bd7c8a643 100644 --- a/src/projectM-pulseaudio/CMakeLists.txt +++ b/src/projectM-pulseaudio/CMakeLists.txt @@ -18,11 +18,11 @@ include(${QT_USE_FILE} FindPkgConfig.cmake) if (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) pkg_search_module(LIBPROJECTM REQUIRED libprojectM) pkg_search_module(LIBPROJECTM-QT REQUIRED libprojectM-qt) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${LIBPROJECTM_PREFIX}"') + ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${LIBPROJECTM_PREFIX}\"') else(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(LIBPROJECTM_FOUND true) set(LIBPROJECTM-QT_FOUND true) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${CMAKE_INSTALL_PREFIX}"') + ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${CMAKE_INSTALL_PREFIX}\"') endif(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) FIND_PACKAGE(OpenGL) @@ -50,16 +50,16 @@ MESSAGE(FATAL_ERROR "ERROR: Pulse Audio is NOT found. Please install pulse audio endif(LIBPULSE_FOUND) # GLEW - A cross plataform C/C++ extension loading library -find_package(GLEW) -if (GLEW_FOUND) - MESSAGE(STATUS "[projectm-pulseaudio] glew library detected.") - message(STATUS "GLEW_LIBRARY = ${GLEW_LIBRARY}") - message(STATUS "GLEW_LIBRARY_DIR = ${GLEW_LIBRARY_DIR}") - include_directories(${GLEW_INCLUDE_DIR}) - link_directories(${GLEW_LIBRARY_DIR}) -else (GLEW_FOUND) - MESSAGE(FATAL_ERROR "ERROR: glew library not detected. Please install it from glew.sourceforge.net") -endif (GLEW_FOUND) +#find_package(GLEW) +#if (GLEW_FOUND) +# MESSAGE(STATUS "[projectm-pulseaudio] glew library detected.") +# message(STATUS "GLEW_LIBRARY = ${GLEW_LIBRARY}") +# message(STATUS "GLEW_LIBRARY_DIR = ${GLEW_LIBRARY_DIR}") +# include_directories(${GLEW_INCLUDE_DIR}) +# link_directories(${GLEW_LIBRARY_DIR}) +#else (GLEW_FOUND) +# MESSAGE(FATAL_ERROR "ERROR: glew library not detected. Please install it from glew.sourceforge.net") +#endif (GLEW_FOUND) # ftgl - OpenGL library to use arbitrary fonts pkg_search_module(FTGL REQUIRED ftgl) @@ -96,18 +96,25 @@ ADD_DEFINITIONS(${QT_DEFINITIONS}) ADD_DEFINITIONS(-DQT_NO_DEBUG) -if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") - set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM ${PROJECTM_ROOT_SOURCE_DIR}/projectM-qt) - set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM ${PROJECTM_ROOT_BINARY_DIR}/projectM-qt) +if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") + set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM ${PROJECTM_ROOT_SOURCE_DIR}/projectM-qt) + set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM ${PROJECTM_ROOT_BINARY_DIR}/projectM-qt) elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM ${LIBPROJECTM-QT_INCLUDEDIR}/libprojectM-qt) - set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS} ${LIBPROJECTM-QT_LDFLAGS}) -# projectM-qt places itself in same location as (lib)projectM -# whether it should is a whole other issue -endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") + set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM ${LIBPROJECTM-QT_INCLUDEDIR}/libprojectM-qt) + set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS} ${LIBPROJECTM-QT_LDFLAGS}) + # projectM-qt places itself in same location as (lib)projectM + # whether it should is a whole other issue +endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") -INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${LIBPULSE_INCLUDEDIR}) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/projectM-pulseaudio) +INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} + ${QT_INCLUDE_DIR} + ${QT_QTGUI_INCLUDE_DIR} + ${QT_QTOPENGL_INCLUDE_DIR} + ${QT_QTCORE_INCLUDE_DIR} + ${LIBPULSE_INCLUDEDIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR}/projectM-pulseaudio +) LINK_DIRECTORIES(${PROJECTM_LINK} ${PULSEAUDIO_LDFLAGS}) diff --git a/src/projectM-qt/CMakeLists.txt b/src/projectM-qt/CMakeLists.txt index b1af7475d..e44b58be4 100644 --- a/src/projectM-qt/CMakeLists.txt +++ b/src/projectM-qt/CMakeLists.txt @@ -35,7 +35,7 @@ endif(LIBPROJECTM_FOUND) CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libprojectM-qt.pc.in" "${CMAKE_CURRENT_SOURCE_DIR}/libprojectM-qt.pc" @ONLY) -ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX="\"${PROJECTM_PREFIX}\"") +ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${PROJECTM_PREFIX}\"') ADD_DEFINITIONS(${QT_DEFINITIONS}) ADD_DEFINITIONS(-DQT_PLUGIN) ADD_DEFINITIONS(-DQT_NO_DEBUG) @@ -110,13 +110,13 @@ set_property(TARGET projectM-qt PROPERTY LINK_INTERFACE_LIBRARIES "") set_property(TARGET projectM-qt PROPERTY IMPORTED_LINK_DEPENDENT_LIBRARIES "") SET_TARGET_PROPERTIES(projectM-qt PROPERTIES VERSION 1.10 SOVERSION 1) -if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") +if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM) set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM) elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM) set(PROJECTM_LINK ${PROJECTM_LDFLAGS}) -endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") +endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") LINK_DIRECTORIES(${PROJECTM_LINK}) diff --git a/src/projectM-test/CMakeLists.txt b/src/projectM-test/CMakeLists.txt index 55cf10170..bbd1e519c 100644 --- a/src/projectM-test/CMakeLists.txt +++ b/src/projectM-test/CMakeLists.txt @@ -20,21 +20,20 @@ FIND_PACKAGE(SDL) if (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) pkg_search_module(LIBPROJECTM REQUIRED libprojectM) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${LIBPROJECTM_PREFIX}"') + ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${LIBPROJECTM_PREFIX}\"') else (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(LIBPROJECTM_FOUND true) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${CMAKE_INSTALL_PREFIX}"') + ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${CMAKE_INSTALL_PREFIX}\"') endif(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) ADD_DEFINITIONS(-DLINUX) - -if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") +if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM) elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM) set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS}) -endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") +endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR}) LINK_DIRECTORIES(${PROJECTM_LINK}) diff --git a/src/projectM-xmms/CMakeLists.txt b/src/projectM-xmms/CMakeLists.txt index cbb8e5411..453e3ca78 100644 --- a/src/projectM-xmms/CMakeLists.txt +++ b/src/projectM-xmms/CMakeLists.txt @@ -22,21 +22,21 @@ endif(LIBXMMS_FOUND) if (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) pkg_search_module(LIBPROJECTM REQUIRED libprojectM) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${LIBPROJECTM_PREFIX}"') + ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${LIBPROJECTM_PREFIX}\"') else (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(LIBPROJECTM_FOUND true) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${CMAKE_INSTALL_PREFIX}"') + ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${CMAKE_INSTALL_PREFIX}\"') endif(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) -ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${PROJECTM_PREFIX}"') +ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${PROJECTM_PREFIX}\"') -if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") +if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM) set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM) elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM) set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS}) -endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") +endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${LIBXMMS_INCLUDEDIR} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR})