diff options
author | Sebastián Barschkis <sebbas@sebbas.org> | 2019-07-23 19:09:17 +0300 |
---|---|---|
committer | Sebastián Barschkis <sebbas@sebbas.org> | 2019-07-23 19:09:17 +0300 |
commit | 02a94d6a4c586232f6484c3bd2f5cf32a96d2f6a (patch) | |
tree | ff3a64097c8f420bc07a992df1f456b5e12bad0b /build_files/cmake | |
parent | eefef6179dc51146710489df3ba04f836ea78390 (diff) | |
parent | b63f0266a056c9ebc7ddc298353d612572216e02 (diff) |
Merge branch 'master' into fluid-mantaflow
Diffstat (limited to 'build_files/cmake')
-rw-r--r-- | build_files/cmake/Modules/FindSndFile.cmake | 8 | ||||
-rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/build_files/cmake/Modules/FindSndFile.cmake b/build_files/cmake/Modules/FindSndFile.cmake index eabc08b0645..a520a45e370 100644 --- a/build_files/cmake/Modules/FindSndFile.cmake +++ b/build_files/cmake/Modules/FindSndFile.cmake @@ -6,7 +6,7 @@ # LIBSNDFILE_LIBRARIES, libraries to link against to use SndFile. # LIBSNDFILE_ROOT_DIR, The base directory to search for SndFile. # This can also be an environment variable. -# LIBSNDFILE_FOUND, If false, do not try to use SndFile. +# SNDFILE_FOUND, If false, do not try to use SndFile. # # also defined, but not for general use are # LIBSNDFILE_LIBRARY, where to find the SndFile library. @@ -50,16 +50,16 @@ FIND_LIBRARY(LIBSNDFILE_LIBRARY lib64 lib ) -# handle the QUIETLY and REQUIRED arguments and set LIBSNDFILE_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set SNDFILE_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(SndFile DEFAULT_MSG LIBSNDFILE_LIBRARY LIBSNDFILE_INCLUDE_DIR) -IF(LIBSNDFILE_FOUND) +IF(SNDFILE_FOUND) SET(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBRARY}) SET(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE_INCLUDE_DIR}) -ENDIF(LIBSNDFILE_FOUND) +ENDIF(SNDFILE_FOUND) MARK_AS_ADVANCED( LIBSNDFILE_INCLUDE_DIR diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 0f5b45d722b..43d13a97a3e 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -156,7 +156,7 @@ endif() # Codecs if(WITH_CODEC_SNDFILE) find_package_wrapper(SndFile) - if(NOT LIBSNDFILE_FOUND) + if(NOT SNDFILE_FOUND) set(WITH_CODEC_SNDFILE OFF) endif() endif() |