diff options
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rw-r--r-- | build_files/cmake/Modules/FindJack.cmake | 67 |
2 files changed, 74 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d6d4258521..5c8236ad5d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -251,12 +251,12 @@ set(CXX_WARNINGS "") # On Unix: # cmake ../blender \ # -D PYTHON_VERSION=3.2 \ -# -D PYTHON_INCLUDE_DIRS=/opt/py32/include/python3.2d \ -# -D PYTHON_LIBRARIES=/opt/py32/lib/libpython3.2d.so +# -D PYTHON_INCLUDE_DIR=/opt/py32/include/python3.2d \ +# -D PYTHON_LIBRARY=/opt/py32/lib/libpython3.2d.so # # On Macs: # cmake ../blender \ -# -D PYTHON_INCLUDE_DIRS=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2 \ +# -D PYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2 \ # -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.2/lib/python3.2/config \ # -G Xcode # @@ -329,10 +329,10 @@ if(UNIX AND NOT APPLE) endif() if(WITH_JACK) - set(JACK /usr) - set(JACK_INCLUDE_DIRS ${JACK}/include/jack) - set(JACK_LIBRARIES jack) - set(JACK_LIBPATH ${JACK}/lib) + find_package(Jack) + if(NOT JACK_FOUND) + set(WITH_JACK OFF) + endif() endif() # Codecs diff --git a/build_files/cmake/Modules/FindJack.cmake b/build_files/cmake/Modules/FindJack.cmake new file mode 100644 index 00000000000..0a8b77ce8fa --- /dev/null +++ b/build_files/cmake/Modules/FindJack.cmake @@ -0,0 +1,67 @@ +# - Find Jack library +# Find the native Jack includes and library +# This module defines +# JACK_INCLUDE_DIRS, where to find jack.h, Set when +# JACK_INCLUDE_DIR is found. +# JACK_LIBRARIES, libraries to link against to use Jack. +# JACK_ROOT_DIR, The base directory to search for Jack. +# This can also be an environment variable. +# JACK_FOUND, If false, do not try to use Jack. +# +# also defined, but not for general use are +# JACK_LIBRARY, where to find the Jack library. + +#============================================================================= +# Copyright 2002-2009 Kitware, Inc. +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# (To distribute this file outside of CMake, substitute the full +# License text for the above reference.) + +# If JACK_ROOT_DIR was defined in the environment, use it. +IF(NOT JACK_ROOT_DIR AND NOT $ENV{JACK_ROOT_DIR} STREQUAL "") + SET(JACK_ROOT_DIR $ENV{JACK_ROOT_DIR}) +ENDIF() + +SET(_jack_SEARCH_DIRS + ${JACK_ROOT_DIR} + /usr/local + /sw # Fink + /opt/local # DarwinPorts + /opt/csw # Blastwave +) + +FIND_PATH(JACK_INCLUDE_DIR jack.h + HINTS + ${_jack_SEARCH_DIRS} + PATH_SUFFIXES + include/jack +) + +FIND_LIBRARY(JACK_LIBRARY + NAMES "jack" + HINTS ${_jack_SEARCH_DIRS} + PATH_SUFFIXES lib64 lib + ) + +# handle the QUIETLY and REQUIRED arguments and set JACK_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jack DEFAULT_MSG + JACK_LIBRARY JACK_INCLUDE_DIR) + +IF(JACK_FOUND) + SET(JACK_LIBRARIES ${JACK_LIBRARY}) + SET(JACK_INCLUDE_DIRS ${JACK_INCLUDE_DIR}) +ENDIF(JACK_FOUND) + +MARK_AS_ADVANCED( + JACK_INCLUDE_DIR + JACK_LIBRARY +) |