Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BlenderPhi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
raas
BlenderPhi
Commits
3c9a7d06
Commit
3c9a7d06
authored
6 years ago
by
Campbell Barton
Committed by
Brecht Van Lommel
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
CMake: Fix WITH_CODEC_SNDFILE detection
D5296 by @frispete
parent
8194477c
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build_files/cmake/Modules/FindSndFile.cmake
+4
-4
4 additions, 4 deletions
build_files/cmake/Modules/FindSndFile.cmake
build_files/cmake/platform/platform_unix.cmake
+1
-1
1 addition, 1 deletion
build_files/cmake/platform/platform_unix.cmake
with
5 additions
and
5 deletions
build_files/cmake/Modules/FindSndFile.cmake
+
4
−
4
View file @
3c9a7d06
...
...
@@ -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.
#
LIB
SNDFILE_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
LIB
SNDFILE_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
(
LIB
SNDFILE_FOUND
)
IF
(
SNDFILE_FOUND
)
SET
(
LIBSNDFILE_LIBRARIES
${
LIBSNDFILE_LIBRARY
}
)
SET
(
LIBSNDFILE_INCLUDE_DIRS
${
LIBSNDFILE_INCLUDE_DIR
}
)
ENDIF
(
LIB
SNDFILE_FOUND
)
ENDIF
(
SNDFILE_FOUND
)
MARK_AS_ADVANCED
(
LIBSNDFILE_INCLUDE_DIR
...
...
This diff is collapsed.
Click to expand it.
build_files/cmake/platform/platform_unix.cmake
+
1
−
1
View file @
3c9a7d06
...
...
@@ -156,7 +156,7 @@ endif()
# Codecs
if
(
WITH_CODEC_SNDFILE
)
find_package_wrapper
(
SndFile
)
if
(
NOT
LIB
SNDFILE_FOUND
)
if
(
NOT SNDFILE_FOUND
)
set
(
WITH_CODEC_SNDFILE OFF
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment