diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-06-18 16:12:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-06-18 16:12:19 +0400 |
| commit | 549c2c58a109974408de29515b48161a756491c9 (patch) | |
| tree | 82a31827bff6646d5779722cb8cfaf547063c475 /CMakeLists.txt | |
| parent | 2d01cb5b279031de45889d443ee89762a02566eb (diff) | |
added FindSndFile cmake module to replace inline checks.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cd775a222b..91fe2aa0f7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -283,10 +283,10 @@ if(UNIX AND NOT APPLE) endif() if(WITH_CODEC_SNDFILE) - set(SNDFILE /usr) - set(SNDFILE_INC ${SNDFILE}/include) - set(SNDFILE_LIB sndfile) - set(SNDFILE_LIBPATH ${SNDFILE}/lib) + find_package(SndFile) + if(NOT SNDFILE_FOUND) + set(WITH_CODEC_SNDFILE OFF) + endif() endif() if(WITH_INTERNATIONAL) @@ -518,9 +518,9 @@ elseif(WIN32) if(WITH_CODEC_SNDFILE) set(SNDFILE ${LIBDIR}/sndfile) - set(SNDFILE_INC ${SNDFILE}/include) - set(SNDFILE_LIB libsndfile-1) - set(SNDFILE_LIBPATH ${SNDFILE}/lib) + set(SNDFILE_INCLUDE_DIRS ${SNDFILE}/include) + set(SNDFILE_LIBRARIES libsndfile-1) + set(SNDFILE_LIBPATH ${SNDFILE}/lib) # TODO, deprecate endif() if(WITH_SDL) @@ -831,9 +831,9 @@ elseif(APPLE) if(WITH_CODEC_SNDFILE) set(SNDFILE ${LIBDIR}/sndfile) - set(SNDFILE_INC ${SNDFILE}/include) - set(SNDFILE_LIB sndfile FLAC ogg vorbis vorbisenc) - set(SNDFILE_LIBPATH ${SNDFILE}/lib ${FFMPEG}/lib) + set(SNDFILE_INCLUDE_DIRS ${SNDFILE}/include) + set(SNDFILE_LIBRARIES sndfile FLAC ogg vorbis vorbisenc) + set(SNDFILE_LIBPATH ${SNDFILE}/lib ${FFMPEG}/lib) # TODO, deprecate endif() set(PYTHON_VERSION 3.2) |