From 8ac0b9532a34383d22b76ff7e274e32780891dc1 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 11 Jun 2010 19:36:06 +0200 Subject: Switching build system again Now it's plain make. --- src/CMakeLists.txt | 73 ----------------------------------------------------- src/FindFaad.cmake | 35 ------------------------- src/FindLibAo.cmake | 37 --------------------------- src/FindMad.cmake | 35 ------------------------- src/config.h.in | 11 -------- 5 files changed, 191 deletions(-) delete mode 100644 src/CMakeLists.txt delete mode 100644 src/FindFaad.cmake delete mode 100644 src/FindLibAo.cmake delete mode 100644 src/FindMad.cmake delete mode 100644 src/config.h.in (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt deleted file mode 100644 index 1357510..0000000 --- a/src/CMakeLists.txt +++ /dev/null @@ -1,73 +0,0 @@ -set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) -set (CMAKE_C_FLAGS -Wall) -set (ENABLE_MAD 0) -set (ENABLE_FAAD 0) -set (BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bin path") -set (MAN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/man CACHE PATH "man path") - -# This removes a warning on newer versions of cmake -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - -option (USE_FAAD "Use libfaad for aac decoding (if available)" on) -option (USE_MAD "Use libmad for mp3 decoding (if available)" on) - -find_package (LibAo REQUIRED) - -# find threading implementation -find_package (Threads REQUIRED) -if (NOT CMAKE_USE_PTHREADS_INIT) - message (FATAL_ERROR "pthread is currently required") -endif (NOT CMAKE_USE_PTHREADS_INIT) - -# check for libm -find_library (LIBM m) -if (NOT LIBM) - message (FATAL_ERROR "libm is required") -endif (NOT LIBM) - -# check for audio decoding library -find_package (Faad) -find_package (Mad) - -if (FAAD_FOUND AND USE_FAAD) - message (STATUS "Found libfaad, enabling aac decoding") - set (ENABLE_FAAD 1) -elseif (FAAD_FOUND AND NOT USE_FAAD) - message (STATUS "Found libfaad, but disabling aac decoding by request") -elseif (NOT FAAD_FOUND AND USE_FAAD) - message (STATUS "libfaad not found but requested") -endif (FAAD_FOUND AND USE_FAAD) - -if (MAD_FOUND AND USE_MAD) - message (STATUS "Found libmad, enabling mp3 decoding") - set (ENABLE_MAD 1) -elseif (MAD_FOUND AND NOT USE_MAD) - message (STATUS "Found libmad, but disabling mp3 decoding by request") -elseif (NOT MAD_FOUND AND USE_MAD) - message (STATUS "libmad not found but requested") -endif (MAD_FOUND AND USE_MAD) - -# check whether faad and/or mad are available and enabled -if (NOT ENABLE_FAAD AND NOT ENABLE_MAD) - message (FATAL_ERROR "libmad and/or libfaad are required.") -endif (NOT ENABLE_FAAD AND NOT ENABLE_MAD) - -configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in - ${CMAKE_CURRENT_BINARY_DIR}/config.h) - -include_directories ( - ${pianobar_SOURCE_DIR}/libpiano/src - ${pianobar_SOURCE_DIR}/libwaitress/src - ${CMAKE_CURRENT_BINARY_DIR} - ${FAAD_INCLUDE_DIRS} ${LIBAO_INCLUDE_DIRS} - ${MAD_INCLUDE_DIRS}) - -add_executable (pianobar main.c terminal.c settings.c player.c ui.c ui_act.c - ui_readline.c) -target_link_libraries (pianobar piano waitress ${FAAD_LIBRARIES} - ${LIBAO_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${MAD_LIBRARIES} ${LIBM}) - -install (TARGETS pianobar RUNTIME DESTINATION ${BIN_INSTALL_DIR}) -install (FILES pianobar.1 DESTINATION ${MAN_INSTALL_DIR}/man1) diff --git a/src/FindFaad.cmake b/src/FindFaad.cmake deleted file mode 100644 index 7e3fe99..0000000 --- a/src/FindFaad.cmake +++ /dev/null @@ -1,35 +0,0 @@ -# FAAD_INCLUDE_DIRS - where to find neaacdec.h, etc. -# FAAD_LIBRARIES - List of libraries when using libfaad. -# FAAD_FOUND - True if libfaad found. - -# Look for the header file. -FIND_PATH(FAAD_INCLUDE_DIR NAMES neaacdec.h) -MARK_AS_ADVANCED(FAAD_INCLUDE_DIR) - -# Look for the library. -FIND_LIBRARY(FAAD_LIBRARY NAMES faad) -MARK_AS_ADVANCED(FAAD_LIBRARY) - -# Copy the results to the output variables. -IF(FAAD_INCLUDE_DIR AND FAAD_LIBRARY) - SET(FAAD_FOUND 1) - SET(FAAD_LIBRARIES ${FAAD_LIBRARY}) - SET(FAAD_INCLUDE_DIRS ${FAAD_INCLUDE_DIR}) -ELSE(FAAD_INCLUDE_DIR AND FAAD_LIBRARY) - SET(FAAD_FOUND 0) - SET(FAAD_LIBRARIES) - SET(FAAD_INCLUDE_DIRS) -ENDIF(FAAD_INCLUDE_DIR AND FAAD_LIBRARY) - -# Report the results. -IF(NOT FAAD_FOUND) - SET(FAAD_DIR_MESSAGE - "FAAD was not found. Make sure FAAD_LIBRARY and FAAD_INCLUDE_DIR are set.") - IF(NOT FAAD_FIND_QUIETLY) - MESSAGE(STATUS "${FAAD_DIR_MESSAGE}") - ELSE(NOT FAAD_FIND_QUIETLY) - IF(FAAD_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "${FAAD_DIR_MESSAGE}") - ENDIF(FAAD_FIND_REQUIRED) - ENDIF(NOT FAAD_FIND_QUIETLY) -ENDIF(NOT FAAD_FOUND) diff --git a/src/FindLibAo.cmake b/src/FindLibAo.cmake deleted file mode 100644 index f026548..0000000 --- a/src/FindLibAo.cmake +++ /dev/null @@ -1,37 +0,0 @@ -# - Find libao -# -# LIBAO_INCLUDE_DIRS - where to find ao/ao.h, etc. -# LIBAO_LIBRARIES - List of libraries when using libao. -# LIBAO_FOUND - True if libao found. - -# Look for the header file. -FIND_PATH(LIBAO_INCLUDE_DIR NAMES ao/ao.h) -MARK_AS_ADVANCED(LIBAO_INCLUDE_DIR) - -# Look for the library. -FIND_LIBRARY(LIBAO_LIBRARY NAMES ao) -MARK_AS_ADVANCED(LIBAO_LIBRARY) - -# Copy the results to the output variables. -IF(LIBAO_INCLUDE_DIR AND LIBAO_LIBRARY) - SET(LIBAO_FOUND 1) - SET(LIBAO_LIBRARIES ${LIBAO_LIBRARY}) - SET(LIBAO_INCLUDE_DIRS ${LIBAO_INCLUDE_DIR}) -ELSE(LIBAO_INCLUDE_DIR AND LIBAO_LIBRARY) - SET(LIBAO_FOUND 0) - SET(LIBAO_LIBRARIES) - SET(LIBAO_INCLUDE_DIRS) -ENDIF(LIBAO_INCLUDE_DIR AND LIBAO_LIBRARY) - -# Report the results. -IF(NOT LIBAO_FOUND) - SET(LIBAO_DIR_MESSAGE - "LIBAO was not found. Make sure LIBAO_LIBRARY and LIBAO_INCLUDE_DIR are set.") - IF(NOT LIBAO_FIND_QUIETLY) - MESSAGE(STATUS "${LIBAO_DIR_MESSAGE}") - ELSE(NOT LIBAO_FIND_QUIETLY) - IF(LIBAO_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "${LIBAO_DIR_MESSAGE}") - ENDIF(LIBAO_FIND_REQUIRED) - ENDIF(NOT LIBAO_FIND_QUIETLY) -ENDIF(NOT LIBAO_FOUND) diff --git a/src/FindMad.cmake b/src/FindMad.cmake deleted file mode 100644 index 1917cd4..0000000 --- a/src/FindMad.cmake +++ /dev/null @@ -1,35 +0,0 @@ -# MAD_INCLUDE_DIRS - where to find mad.h, etc. -# MAD_LIBRARIES - List of libraries when using libmad. -# MAD_FOUND - True if libmad found. - -# Look for the header file. -FIND_PATH(MAD_INCLUDE_DIR NAMES mad.h) -MARK_AS_ADVANCED(MAD_INCLUDE_DIR) - -# Look for the library. -FIND_LIBRARY(MAD_LIBRARY NAMES mad) -MARK_AS_ADVANCED(MAD_LIBRARY) - -# Copy the results to the output variables. -IF(MAD_INCLUDE_DIR AND MAD_LIBRARY) - SET(MAD_FOUND 1) - SET(MAD_LIBRARIES ${MAD_LIBRARY}) - SET(MAD_INCLUDE_DIRS ${MAD_INCLUDE_DIR}) -ELSE(MAD_INCLUDE_DIR AND MAD_LIBRARY) - SET(MAD_FOUND 0) - SET(MAD_LIBRARIES) - SET(MAD_INCLUDE_DIRS) -ENDIF(MAD_INCLUDE_DIR AND MAD_LIBRARY) - -# Report the results. -IF(NOT MAD_FOUND) - SET(MAD_DIR_MESSAGE - "libmad was not found. Make sure MAD_LIBRARY and MAD_INCLUDE_DIR are set.") - IF(NOT MAD_FIND_QUIETLY) - MESSAGE(STATUS "${MAD_DIR_MESSAGE}") - ELSE(NOT MAD_FIND_QUIETLY) - IF(MAD_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "${MAD_DIR_MESSAGE}") - ENDIF(MAD_FIND_REQUIRED) - ENDIF(NOT MAD_FIND_QUIETLY) -ENDIF(NOT MAD_FOUND) diff --git a/src/config.h.in b/src/config.h.in deleted file mode 100644 index a75a43f..0000000 --- a/src/config.h.in +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef _CONFIG_H -#define _CONFIG_H - -/* package name */ -#define PACKAGE "${PACKAGE}" - -/* used libraries */ -#cmakedefine ENABLE_FAAD -#cmakedefine ENABLE_MAD - -#endif /* _CONFIG_H */ -- cgit v1.2.3