mirror of
https://github.com/projectM-visualizer/projectm.git
synced 2026-02-26 13:25:38 +00:00
incomplete renaming was done in projectM-qt CMakeLists.txt. kudos to Frank Roscher for pointing me in right direction.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@933 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
@ -11,7 +11,7 @@ if (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
|
||||
pkg_search_module(LIBPROJECTM-QT REQUIRED libprojectM-qt)
|
||||
else(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
|
||||
set(LIBPROJECTM_FOUND true)
|
||||
set(LIBPROJECTM_QT_FOUND true)
|
||||
set(LIBPROJECTM-QT_FOUND true)
|
||||
endif(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
|
||||
|
||||
FIND_PACKAGE(OpenGL)
|
||||
@ -26,11 +26,11 @@ 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)
|
||||
|
||||
if (LIBPROJECTM_QT_FOUND)
|
||||
if (LIBPROJECTM-QT_FOUND)
|
||||
MESSAGE (STATUS "projectM-qt detected.")
|
||||
else(LIBPROJECTM_QT_FOUND)
|
||||
else(LIBPROJECTM-QT_FOUND)
|
||||
MESSAGE (FATAL_ERROR "projectM-qt NOT detected. Please install the projectM-qt module or build from the top level projectM source directory.")
|
||||
endif(LIBPROJECTM_QT_FOUND)
|
||||
endif(LIBPROJECTM-QT_FOUND)
|
||||
|
||||
if (LIBPULSE_FOUND)
|
||||
MESSAGE(STATUS "Pulse audio detected")
|
||||
@ -66,8 +66,8 @@ if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
|
||||
set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine ${PROJECTM_ROOT_SOURCE_DIR}/projectM-qt)
|
||||
set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine ${PROJECTM_ROOT_BINARY_DIR}/projectM-qt)
|
||||
elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
|
||||
set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM ${LIBQPROJECTM_INCLUDEDIR}/libprojectM-qt)
|
||||
set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS} ${LIBQPROJECTM_LDFLAGS})
|
||||
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")
|
||||
|
||||
Reference in New Issue
Block a user