From 88527bc6850a6e1e37129667134d06ccfb9f9473 Mon Sep 17 00:00:00 2001 From: psperl Date: Thu, 14 Jun 2007 05:01:35 +0000 Subject: [PATCH] Modest CMake improvements git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@173 6778bc44-b910-0410-a7a0-be141de4315d --- src/projectM-engine/CMakeLists.txt | 9 +++++---- src/projectM-engine/libprojectM.pc.in | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/projectM-engine/CMakeLists.txt b/src/projectM-engine/CMakeLists.txt index e072d09e1..469a126a4 100644 --- a/src/projectM-engine/CMakeLists.txt +++ b/src/projectM-engine/CMakeLists.txt @@ -14,15 +14,16 @@ IF(USE_DEBUG) ADD_DEFINITIONS(-DUSE_DEBUG) ENDIF(USE_DEBUG) +TARGET_LINK_LIBRARIES(projectM GLEW m) + IF(USE_FTGL) - pkg_search_module (FTGL ftgl) + pkg_search_module (FTGL REQUIRED ftgl) ADD_DEFINITIONS(-DUSE_FTGL) INCLUDE_DIRECTORIES(${FTGL_INCLUDE_DIRS}) - LINK_DIRECTORIES(${FTGL_LIBRARY_DIRS}) + LINK_DIRECTORIES(${FTGL_LDFLAGS}) + TARGET_LINK_LIBRARIES(projectM GLEW m ftgl) ENDIF(USE_FTGL) -TARGET_LINK_LIBRARIES(projectM GLEW m) - CONFIGURE_FILE("libprojectM.pc.in" "libprojectM.pc" @ONLY) INSTALL(FILES "${CMAKE_BINARY_DIR}/libprojectM.pc" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) diff --git a/src/projectM-engine/libprojectM.pc.in b/src/projectM-engine/libprojectM.pc.in index ac40932be..ce7aed630 100644 --- a/src/projectM-engine/libprojectM.pc.in +++ b/src/projectM-engine/libprojectM.pc.in @@ -9,6 +9,6 @@ Name: libprojectM Version: 1.00 Description: projectM - OpenGL Milkdrop Requires: -Libs: -L${libdir} -Cflags: -I${includedir} +Libs: -lprojectM +Cflags: