diff --git a/3rdparty/libprojectm/CMakeLists.txt b/3rdparty/libprojectm/CMakeLists.txt index cb1a853f3..e91a14153 100644 --- a/3rdparty/libprojectm/CMakeLists.txt +++ b/3rdparty/libprojectm/CMakeLists.txt @@ -79,11 +79,11 @@ ADD_DEFINITIONS(-DUSE_FBO) endif(USE_FBO) if(USE_FTGL) -ADD_DEFINITIONS(-DUSE_FTGL) - -find_package( Freetype2 REQUIRED) -include_directories( ${FREETYPE2_INCLUDE_DIR} ) + ADD_DEFINITIONS(-DUSE_FTGL) + pkg_check_modules(FREETYPE2 freetype2) + pkg_check_modules(FTGL ftgl) + include_directories( ${FREETYPE2_INCLUDE_DIRS} ) endif(USE_FTGL) @@ -134,7 +134,7 @@ IF(USE_OPENMP AND SUPPORTS_OPENMP) ENDIF(USE_OPENMP AND SUPPORTS_OPENMP) INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} ${FTGL_INCLUDE_DIRS} ${Renderer_SOURCE_DIR} ${PRESET_FACTORY_SOURCES}) -LINK_DIRECTORIES(${FTGL_LINK_DIRS} ${Renderer_BINARY_DIR} ${PRESET_FACTORY_BINARY_DIR}) +LINK_DIRECTORIES(${FTGL_LIBRARY_DIRS} ${Renderer_BINARY_DIR} ${PRESET_FACTORY_BINARY_DIR}) if(MSVC) SET (MATH_LIBRARIES ) @@ -143,11 +143,9 @@ else(MSVC) endif(MSVC) if(BUILD_PROJECTM_STATIC) - TARGET_LINK_LIBRARIES(projectM ${GLEW_LIBRARIES} ${MATH_LIBRARIES} ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) + TARGET_LINK_LIBRARIES(projectM ${GLEW_LIBRARIES} ${MATH_LIBRARIES} ${FTGL_LIBRARIES} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) else(BUILD_PROJECTM_STATIC) - -TARGET_LINK_LIBRARIES(projectM ${GLEW_LIBRARIES} ${MATH_LIBRARIES} ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) - + TARGET_LINK_LIBRARIES(projectM ${GLEW_LIBRARIES} ${MATH_LIBRARIES} ${FTGL_LIBRARIES} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) endif(BUILD_PROJECTM_STATIC)