projectm (2.0.1+dfsg-12) 05_lprojectm_fix-cmakelists.patch

Description: Make some changes on libprojectMs CMakeLists.txt
 * Set right upstream version in library
 * Remove the USE_THREADS option pending an update from upstream
 * Exclude fonts from build
 * Correctly set LIB_INSTALl_DIR variable (Closes: #591011)
Forwarded: no
Author: Matthias Klumpp <matthias@tenstral.net>
Last-Update: 2010-06-26

--- a/src/libprojectM/CMakeLists.txt
+++ b/src/libprojectM/CMakeLists.txt
@@ -5,13 +5,11 @@
 INCLUDE(cmake/CPack-projectM.cmake)
 
 
-
-
 cmake_policy(SET CMP0005 OLD)
 
 
 set( CMAKE_MODULE_PATH    ${CMAKE_MODULE_PATH}
-                          ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
+                          ${CMAKE_CURRENT_SOURCE_DIR}/cmake )     
 
 OPTION (USE_DEVIL "Use devIL for image loading rather than the builtin SOIL library" OFF)
 
@@ -34,8 +32,18 @@
 OPTION (DISABLE_NATIVE_PRESETS "Turn off support for native (C++ style) presets" OFF)
 OPTION (DISABLE_MILKDROP_PRESETS "Turn off support for Milkdrop (.milk / .prjm) presets"  OFF)
 
+SET(LIB_SUFFIX ""
+  CACHE STRING "Define suffix of directory name (32/64)"
+  FORCE)
+
+ADD_DEFINITIONS(-DLIB_SUFFIX="\\\"${LIB_SUFFIX}\\\"")
+
 ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
 
+SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}"
+  CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})"
+  FORCE)  
+  
 if (USE_NATIVE_GLEW)
 ADD_DEFINITIONS(-DUSE_NATIVE_GLEW)
 SET(GLEW_SOURCES glew.h glew.c)
@@ -110,9 +118,9 @@
 ADD_LIBRARY(projectM SHARED ${projectM_SOURCES})
 endif(BUILD_PROJECTM_STATIC)
 
-SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.00 SOVERSION 2)
+SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.0.1 SOVERSION 2)
 
-ADD_DEFINITIONS(-DUSE_THREADS)
+#ADD_DEFINITIONS(-DUSE_THREADS)
 
 if (APPLE)
 ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS -DUSE_THREADS)
@@ -123,7 +131,8 @@
 ADD_DEFINITIONS(-DWIN32 -DSTBI_NO_DDS -DUSE_THREADS)
 else(WIN32)
 set (RESOURCE_PREFIX "share/projectM")
-ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS -DUSE_THREADS)
+#ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS -DUSE_THREADS)
+ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS)
 endif(WIN32)
 endif(APPLE)
 
@@ -190,8 +199,6 @@
 
 FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga")
 INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets)
-FILE(GLOB fonts "fonts/*.ttf")
-INSTALL(FILES ${fonts} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/fonts)
 INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)