mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-27 10:25:42 +00:00
Code Issues Projects Releases Wiki Activity

trivial: Cleanup cmake

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1369 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
ximion
2012-01-03 17:51:58 +00:00
parent b35dbc18d7
commit 3702a23bda
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libprojectM/cmake/CPack-projectM.cmake
View File

@ -3,9 +3,9 @@
SET(CPACK_GENERATORS "TGZ")
SET(CPACK_SOURCE_GENERATORS "TGZ")
SET(CPACK_STRIP_FILES ON)
#SET(CPACK_IGNORE_FILES
#SET(CPACK_IGNORE_FILES
# "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o")
SET(CPACK_SOURCE_IGNORE_FILES
SET(CPACK_SOURCE_IGNORE_FILES
"Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip;.*svn")
#SET(CPACK_BINARY_RPM OFF)
@ -20,5 +20,8 @@ SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "0")
SET(CPACK_PACKAGE_VERSION_PATCH "1")
INCLUDE(CPack)
IF(CPACK_PROJECTM_INCLUDED)
INCLUDE(CPack)
ELSE(CPACK_PROJECTM_INCLUDED)
SET(CACHE CPACK_PROJECTM_INCLUDED 1)
ENDIF(CPACK_PROJECTM_INCLUDED)

14
src/projectM-pulseaudio/CMakeLists.txt
View File

@ -49,18 +49,6 @@ else (LIBPULSE_FOUND)
MESSAGE(FATAL_ERROR "ERROR: Pulse Audio is NOT found. Please install pulse audio 0.9.8 or greater from www.pulseaudio.org.")
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)
# ftgl - OpenGL library to use arbitrary fonts
pkg_search_module(FTGL REQUIRED ftgl)
if (FTGL_FOUND)
@ -116,8 +104,6 @@ INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE}
${CMAKE_BINARY_DIR}/projectM-pulseaudio
)
LINK_DIRECTORIES(${PROJECTM_LINK} ${PULSEAUDIO_LDFLAGS})
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
endif(COMMAND cmake_policy)