Skip to content

Commit b1b43bf

Browse files
committed
INSTALLED_FAUST: It is now a fatal error if the search for the Faust library files fails, or the user specified the wrong library directory.
1 parent 2b687d6 commit b1b43bf

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,13 @@ message(STATUS "Installation goes to CMAKE_INSTALL_PREFIX/${INSTALL_DIR}")
123123
message(STATUS "(set the INSTALL_DIR variable to override)")
124124

125125
if(INSTALLED_FAUST)
126-
## Grab the .lib files from the installed Faust using the FAUSTLIB path,
127-
## /usr/share/faust by default. You can adjust this path if needed by
128-
## setting the FAUSTLIB variable accordingly.
129-
find_path(FAUSTLIB all.lib PATH_SUFFIXES faust share/faust)
130-
if(NOT FAUSTLIB)
131-
set(FAUSTLIB "/usr/share/faust")
132-
message(WARNING "Faust library files not found, assuming ${FAUSTLIB} (set the FAUSTLIB variable to override)")
126+
## Grab the .lib files from the installed Faust using the FAUSTLIB
127+
## path. There's no default here if the search for the library files fails,
128+
## but you can adjust this path if needed by setting the FAUSTLIB variable
129+
## accordingly.
130+
find_path(FAUSTLIB all.lib PATH_SUFFIXES faust share/faust REQUIRED)
131+
if(NOT EXISTS "${FAUSTLIB}/all.lib")
132+
message(FATAL_ERROR "Faust library files not found at ${FAUSTLIB}, maybe you specified the wrong FAUSTLIB directory? Otherwise try using the included Faust instead (INSTALLED_FAUST=OFF).")
133133
else()
134134
message(STATUS "Faust library files found at ${FAUSTLIB}")
135135
message(STATUS "(set the FAUSTLIB variable to override)")

0 commit comments

Comments
 (0)