fluid-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[fluid-dev] [PATCH 3/4] Remove ${} from CMAKE_SYSTEM variable in IF stat


From: KO Myung-Hun
Subject: [fluid-dev] [PATCH 3/4] Remove ${} from CMAKE_SYSTEM variable in IF statement
Date: Sun, 5 Feb 2017 19:53:49 +0900

IF statement interprets a variable without ${}.

And without this, CMAKE_SYSTEM is not checked correctly on CMAKE 3.4.1.
---
 fluidsynth/CMakeLists.txt | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/fluidsynth/CMakeLists.txt b/fluidsynth/CMakeLists.txt
index 0ff78fb..4fbecdf 100644
--- a/fluidsynth/CMakeLists.txt
+++ b/fluidsynth/CMakeLists.txt
@@ -69,22 +69,22 @@ option ( BUILD_SHARED_LIBS "Build a shared object or DLL" 
on )
 option ( enable-ipv6  "enable ipv6 support " on )
 
 # Platform specific options
-if ( ${CMAKE_SYSTEM} MATCHES "Linux" )
+if ( CMAKE_SYSTEM MATCHES "Linux" )
     option ( enable-ladcca "compile LADCCA support if it is available 
(deprecated)" off )
     option ( enable-lash "compile LASH support (if it is available)" on )
     option ( enable-alsa "compile ALSA support (if it is available)" on )
-endif ( ${CMAKE_SYSTEM} MATCHES "Linux" )
+endif ( CMAKE_SYSTEM MATCHES "Linux" )
 
-if ( ${CMAKE_SYSTEM} MATCHES "Darwin" )
+if ( CMAKE_SYSTEM MATCHES "Darwin" )
     option ( enable-coreaudio "compile CoreAudio support (if it is available)" 
on )
     option ( enable-coremidi "compile CoreMIDI support (if it is available)" 
on )
     option ( enable-framework "create a Mac OSX style FluidSynth.framework" on 
)
-endif ( ${CMAKE_SYSTEM} MATCHES "Darwin" )
+endif ( CMAKE_SYSTEM MATCHES "Darwin" )
 
-if ( ${CMAKE_SYSTEM} MATCHES "OS2" )
+if ( CMAKE_SYSTEM MATCHES "OS2" )
     option ( enable-dart "compile DART support (if it is available)" on )
     set ( enable-ipv6 off )
-endif ( ${CMAKE_SYSTEM} MATCHES "OS2" )
+endif ( CMAKE_SYSTEM MATCHES "OS2" )
 
 # Initialize the library directory name suffix.
 if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
@@ -184,7 +184,7 @@ endif ( WIN32 )
 unset ( DART_SUPPORT CACHE )
 unset ( DART_LIBS CACHE )
 unset ( DART_INCLUDE_DIRS CACHE )
-if ( ${CMAKE_SYSTEM} MATCHES "OS2" )
+if ( CMAKE_SYSTEM MATCHES "OS2" )
   set ( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Zbin-files" )
   set ( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Zbin-files" )
   if ( enable-dart )
@@ -192,13 +192,13 @@ if ( ${CMAKE_SYSTEM} MATCHES "OS2" )
     set ( DART_SUPPORT ${HAVE_DART_H} )
     unset ( DART_INCLUDE_DIRS CACHE )
   endif ( enable-dart )
-endif ( ${CMAKE_SYSTEM} MATCHES "OS2" )
+endif ( CMAKE_SYSTEM MATCHES "OS2" )
 
 # Solaris / SunOS
-if ( ${CMAKE_SYSTEM} MATCHES "SunOS" )
+if ( CMAKE_SYSTEM MATCHES "SunOS" )
   set ( FLUID_LIBS "${FLUID_LIBS};nsl;socket" )
   set ( LIBFLUID_LIBS "${LIBFLUID_LIBS};nsl;socket" )
-endif ( ${CMAKE_SYSTEM} MATCHES "SunOS" )
+endif ( CMAKE_SYSTEM MATCHES "SunOS" )
 
 # Apple Mac OSX
 unset ( COREAUDIO_SUPPORT CACHE )
@@ -207,7 +207,7 @@ unset ( COREMIDI_SUPPORT CACHE )
 unset ( COREMIDI_LIBS CACHE )
 unset ( DARWIN CACHE )
 unset ( MACOSX_FRAMEWORK CACHE )
-if ( ${CMAKE_SYSTEM} MATCHES "Darwin" )
+if ( CMAKE_SYSTEM MATCHES "Darwin" )
   set ( DARWIN 1 )
   set ( CMAKE_INSTALL_NAME_DIR
         ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}${LIB_SUFFIX} )
@@ -228,7 +228,7 @@ if ( ${CMAKE_SYSTEM} MATCHES "Darwin" )
   if ( enable-framework )
     set ( MACOSX_FRAMEWORK 1 )
   endif ( enable-framework )
-endif ( ${CMAKE_SYSTEM} MATCHES "Darwin" )
+endif ( CMAKE_SYSTEM MATCHES "Darwin" )
 
 unset ( WITH_FLOAT CACHE )
 if ( enable-floats )
-- 
2.11.0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]