diff --git a/cmake/modules/FindJack.cmake b/cmake/modules/FindJack.cmake deleted file mode 100644 index a39fd63470..0000000000 --- a/cmake/modules/FindJack.cmake +++ /dev/null @@ -1,82 +0,0 @@ -# - Try to find jack-2.6 -# Once done this will define -# -# JACK_FOUND - system has jack -# JACK_INCLUDE_DIRS - the jack include directory -# JACK_LIBRARIES - Link these to use jack -# JACK_DEFINITIONS - Compiler switches required for using jack -# -# Copyright (c) 2008 Andreas Schneider -# Modified for other libraries by Lasse Kärkkäinen -# -# Redistribution and use is allowed according to the terms of the New -# BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -# - -if (JACK_LIBRARIES AND JACK_INCLUDE_DIRS) - # in cache already - set(JACK_FOUND TRUE) -else (JACK_LIBRARIES AND JACK_INCLUDE_DIRS) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) - include(UsePkgConfig) - pkgconfig(jack _JACK_INCLUDEDIR _JACK_LIBDIR _JACK_LDFLAGS _JACK_CFLAGS) - else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) - find_package(PkgConfig) - if (PKG_CONFIG_FOUND) - pkg_check_modules(_JACK jack) - endif (PKG_CONFIG_FOUND) - endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) - find_path(JACK_INCLUDE_DIR - NAMES - jack/jack.h - PATHS - ${_JACK_INCLUDEDIR} - /usr/include - /usr/local/include - /opt/local/include - /sw/include - ) - - find_library(JACK_LIBRARY - NAMES - jack - PATHS - ${_JACK_LIBDIR} - /usr/lib - /usr/local/lib - /opt/local/lib - /sw/lib - ) - - if (JACK_LIBRARY AND JACK_INCLUDE_DIR) - set(JACK_FOUND TRUE) - - set(JACK_INCLUDE_DIRS - ${JACK_INCLUDE_DIR} - ) - - set(JACK_LIBRARIES - ${JACK_LIBRARIES} - ${JACK_LIBRARY} - ) - - endif (JACK_LIBRARY AND JACK_INCLUDE_DIR) - - if (JACK_FOUND) - if (NOT JACK_FIND_QUIETLY) - message(STATUS "Found jack: ${JACK_LIBRARY}") - endif (NOT JACK_FIND_QUIETLY) - else (JACK_FOUND) - if (JACK_FIND_REQUIRED) - message(FATAL_ERROR "Could not find JACK") - endif (JACK_FIND_REQUIRED) - endif (JACK_FOUND) - - # show the JACK_INCLUDE_DIRS and JACK_LIBRARIES variables only in the advanced view - mark_as_advanced(JACK_INCLUDE_DIRS JACK_LIBRARIES) - -endif (JACK_LIBRARIES AND JACK_INCLUDE_DIRS) - diff --git a/cmake/modules/FindLibrt.cmake b/cmake/modules/FindLibrt.cmake deleted file mode 100644 index 34450d3924..0000000000 --- a/cmake/modules/FindLibrt.cmake +++ /dev/null @@ -1,61 +0,0 @@ -# You may redistribute this program and/or modify it under the terms of -# the GNU General Public License as published by the Free Software Foundation, -# either version 3 of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -if(NOT LIBRT_FOUND) - - find_path(LIBRT_INCLUDE_DIR - NAMES - time.h - PATHS - ${LIBRTDIR}/include/ - ) - - find_file( - LIBRT_LIBRARIES librt.a - PATHS - ${LIBRTDIR}/lib/ - /usr/local/lib64/ - /usr/local/lib/ - /usr/lib/i386-linux-gnu/ - /usr/lib/x86_64-linux-gnu/ - /usr/lib64/ - /usr/lib/ - ) - set (LIBRT_DYNAMIC "Using static library.") - - if (NOT LIBRT_LIBRARIES) - find_library( - LIBRT_LIBRARIES rt - PATHS - ${LIBRTDIR}/lib/ - /usr/local/lib64/ - /usr/local/lib/ - /usr/lib/i386-linux-gnu/ - /usr/lib/x86_64-linux-gnu/ - /usr/lib64/ - /usr/lib/ - ) - set (LIBRT_DYNAMIC "Using dynamic library.") - endif (NOT LIBRT_LIBRARIES) - - if (LIBRT_INCLUDE_DIR AND LIBRT_LIBRARIES) - set (LIBRT_FOUND TRUE) - endif (LIBRT_INCLUDE_DIR AND LIBRT_LIBRARIES) - - if (LIBRT_FOUND) - message(STATUS "Found librt: ${LIBRT_INCLUDE_DIR}, ${LIBRT_LIBRARIES} ${LIBRT_DYNAMIC}") - else (LIBRT_FOUND) - if (Librt_FIND_REQUIRED) - message (FATAL_ERROR "Could not find librt, try to setup LIBRT_PREFIX accordingly") - endif (Librt_FIND_REQUIRED) - endif (LIBRT_FOUND) - -endif (NOT LIBRT_FOUND) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index a416f8aac1..51c33bfa38 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -157,8 +157,6 @@ target_link_libraries( if (APPLE) # link in required OS X frameworks and include the right GL headers find_library(AppKit AppKit) - find_library(AudioToolbox AudioToolbox) - find_library(AudioUnit AudioUnit) find_library(CoreAudio CoreAudio) find_library(CoreServices CoreServices) find_library(Carbon Carbon) @@ -174,9 +172,7 @@ if (APPLE) target_link_libraries( ${TARGET_NAME} ${AppKit} - ${AudioToolbox} - ${AudioUnit} - ${CoreAudio} + ${CoreAudio} ${CoreServices} ${Carbon} ${Foundation} @@ -212,16 +208,11 @@ else (WIN32) # link required libraries on UNIX if (UNIX AND NOT APPLE) find_package(Threads REQUIRED) - find_package(Librt REQUIRED) - find_package(ALSA) - find_package(Jack) - target_link_libraries(${TARGET_NAME} - ${CMAKE_THREAD_LIBS_INIT} - ${LIBRT_LIBRARIES} - ${JACK_LIBRARIES} - ${ALSA_LIBRARIES} - ${GLUT_LIBRARY} + target_link_libraries( + ${TARGET_NAME} + ${CMAKE_THREAD_LIBS_INIT} + ${GLUT_LIBRARY} ) endif (UNIX AND NOT APPLE) endif (WIN32)