From e8fffabeb88f5d891e674eae6c5184e02a0a4331 Mon Sep 17 00:00:00 2001 From: w1z7ard Date: Mon, 26 Mar 2012 02:25:31 +0000 Subject: [PATCH] fix build regressions when building from project root git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1388 6778bc44-b910-0410-a7a0-be141de4315d --- src/projectM-pulseaudio/CMakeLists.txt | 4 ++-- src/projectM-qt/CMakeLists.txt | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/projectM-pulseaudio/CMakeLists.txt b/src/projectM-pulseaudio/CMakeLists.txt index 5f3e23bd2..2adc9077b 100644 --- a/src/projectM-pulseaudio/CMakeLists.txt +++ b/src/projectM-pulseaudio/CMakeLists.txt @@ -57,8 +57,8 @@ if (FTGL_FOUND) message(STATUS "FTGL_LIBRARY_DIRS = ${FTGL_LIBRARY_DIRS}") include_directories(${FTGL_INCLUDE_DIRS}) link_directories(${FTGL_LIBRARY_DIRS}) -else (FTGL_FOUND) - message(FATAL_ERROR "ERROR: ftgl library not detected. Please install it from ftgl.wiki.sourceforge.net") +else (FTGL_FOUND USE) +## message(FATAL_ERROR "ERROR: ftgl library not detected. Please install it from ftgl.wiki.sourceforge.net") endif (FTGL_FOUND) set(projectM_pulseaudio_SRCS diff --git a/src/projectM-qt/CMakeLists.txt b/src/projectM-qt/CMakeLists.txt index e73ab522f..963308272 100644 --- a/src/projectM-qt/CMakeLists.txt +++ b/src/projectM-qt/CMakeLists.txt @@ -8,11 +8,11 @@ include(cmake/CPack-projectM.cmake) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ) include(FindPkgConfig.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") OPTION(BUILD_PROJECTM_QT_STATIC "Build a static library of projectM-qt rather than the usual shared library format" OFF) @@ -116,8 +116,8 @@ set_property(TARGET projectM-qt PROPERTY IMPORTED_LINK_DEPENDENT_LIBRARIES "") SET_TARGET_PROPERTIES(projectM-qt PROPERTIES VERSION ${PROJECTM_QT_VERSION} SOVERSION ${PROJECTM_QT_ABI_LEVEL}) if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM) - set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM) + set(PROJECTM_INCLUDE ${projectM-complete_SOURCE_DIR}/libprojectM) + set(PROJECTM_LINK ${projectM-complete_BINARY_DIR}/libprojectM) elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM) set(PROJECTM_LINK ${PROJECTM_LDFLAGS})