Don't mix old- and new-style FIND_PACKAGE_HANDLE_STANDARD_ARGS calls
Some (all?) versions of cmake seem to get a bit confused when an old-style FIND_PACKAGE_HANDLE_STANDARD_ARGS call fails, and the scripts attempt a new- style call later on. It continues to think it's using old-style, acting as if REQUIRED_VARS is the message and looks for a VERSION_VAR variable.
This commit is contained in:
parent
ddd1550a8b
commit
e78acce652
@ -6,11 +6,6 @@
|
|||||||
# FLUIDSYNTH_FOUND - True if fluidsynth found.
|
# FLUIDSYNTH_FOUND - True if fluidsynth found.
|
||||||
|
|
||||||
|
|
||||||
IF (FLUIDSYNTH_INCLUDE_DIR AND FLUIDSYNTH_LIBRARIES)
|
|
||||||
# Already in cache, be silent
|
|
||||||
SET(FluidSynth_FIND_QUIETLY TRUE)
|
|
||||||
ENDIF (FLUIDSYNTH_INCLUDE_DIR AND FLUIDSYNTH_LIBRARIES)
|
|
||||||
|
|
||||||
FIND_PATH(FLUIDSYNTH_INCLUDE_DIR fluidsynth.h)
|
FIND_PATH(FLUIDSYNTH_INCLUDE_DIR fluidsynth.h)
|
||||||
|
|
||||||
FIND_LIBRARY(FLUIDSYNTH_LIBRARIES NAMES fluidsynth )
|
FIND_LIBRARY(FLUIDSYNTH_LIBRARIES NAMES fluidsynth )
|
||||||
@ -19,5 +14,6 @@ MARK_AS_ADVANCED( FLUIDSYNTH_LIBRARIES FLUIDSYNTH_INCLUDE_DIR )
|
|||||||
# handle the QUIETLY and REQUIRED arguments and set FLUIDSYNTH_FOUND to TRUE if
|
# handle the QUIETLY and REQUIRED arguments and set FLUIDSYNTH_FOUND to TRUE if
|
||||||
# all listed variables are TRUE
|
# all listed variables are TRUE
|
||||||
INCLUDE(FindPackageHandleStandardArgs)
|
INCLUDE(FindPackageHandleStandardArgs)
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(FluidSynth DEFAULT_MSG FLUIDSYNTH_LIBRARIES FLUIDSYNTH_INCLUDE_DIR)
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(FluidSynth
|
||||||
|
REQUIRED_VARS FLUIDSYNTH_LIBRARIES FLUIDSYNTH_INCLUDE_DIR)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user