summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2014-05-10 09:25:25 -0700
committerChris Robinson <[email protected]>2014-05-10 09:34:16 -0700
commite78acce6523ac69aa04e17053cf5b72470eb90c1 (patch)
treed0ff5d49c62abd1012d1ce644c2dbda339c2ad68 /cmake
parentddd1550a8b4e32e64eab1c5ab02ac22d91f664a5 (diff)
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.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/FindFluidSynth.cmake8
1 files changed, 2 insertions, 6 deletions
diff --git a/cmake/FindFluidSynth.cmake b/cmake/FindFluidSynth.cmake
index 7d5cb6a8..fe96b225 100644
--- a/cmake/FindFluidSynth.cmake
+++ b/cmake/FindFluidSynth.cmake
@@ -6,11 +6,6 @@
# 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_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
# all listed variables are TRUE
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)