--- qsampler/trunk/CMakeLists.txt	2019/10/17 14:09:09	3633
+++ qsampler/trunk/CMakeLists.txt	2020/03/27 17:57:40	3758
@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.1)
 
-set (VERSION "0.6.0")
+set (VERSION "0.6.3")
 
 set (CONFIG_VERSION ${VERSION})
 execute_process (
@@ -109,16 +109,25 @@
 
 # Check for LSCP libraries.
 pkg_check_modules (LSCP REQUIRED lscp)
-set (CONFIG_LIBLSCP ${LSCP_FOUND})
-if (CONFIG_LIBLSCP)
+if (LSCP_FOUND)
+  set (CONFIG_LIBLSCP 1)
   include_directories (${LSCP_INCLUDE_DIRS})
   link_directories (${LSCP_LIBRARY_DIRS})
 # link_libraries (${LSCP_LIBRARIES})
   set (CMAKE_REQUIRED_LIBRARIES "${LSCP_LIBRARIES};${CMAKE_REQUIRED_LIBRARIES}")
   # Check for for instrument_name in lscp_channel_info_t.
-  check_include_file (lscp/client.h CONFIG_INSTRUMENT_NAME)
+  check_include_file (lscp/client.h HAVE_LSCP_CLIENT_H)
+  if (NOT HAVE_LSCP_CLIENT_H)
+    set (CONFIG_INSTRUMENT_NAME 0)
+  else ()
+    set (CONFIG_INSTRUMENT_NAME 1)    
+  endif ()
   # Check for mute/solo in lscp_channel_info_t.
-  check_include_file (lscp/client.h CONFIG_MUTE_SOLO)
+  if (NOT HAVE_LSCP_CLIENT_H)
+    set (CONFIG_MUTE_SOLO 0)
+  else ()
+    set (CONFIG_MUTE_SOLO 1)    
+  endif ()
   if (CONFIG_MUTE_SOLO)
     check_function_exists (lscp_set_channel_mute CONFIG_MUTE_SOLO)
   endif ()
@@ -131,33 +140,50 @@
   check_function_exists (lscp_create_fxsend CONFIG_FXSEND)
   # Check for FX send level in lscp_fxsend_info_t
   if (CONFIG_FXSEND)
-    check_include_file (lscp/client.h CONFIG_FXSEND_LEVEL)
+    if (NOT HAVE_LSCP_CLIENT_H)
+      set (CONFIG_FXSEND_LEVEL 0)
+    else ()
+      set (CONFIG_FXSEND_LEVEL 1)    
+    endif ()
   endif ()
   # Check if FX send rename is available.
   if (CONFIG_FXSEND)
     check_function_exists (lscp_set_fxsend_name CONFIG_FXSEND_RENAME)
   endif ()
   # Check for audio_routing array type
-  check_include_file (lscp/client.h CONFIG_AUDIO_ROUTING)
+  if (NOT HAVE_LSCP_CLIENT_H)
+    set (CONFIG_AUDIO_ROUTING 0)
+  else ()
+    set (CONFIG_AUDIO_ROUTING 1)    
+  endif ()
   # Check if global volume is available.
   check_function_exists (lscp_set_volume CONFIG_VOLUME)
   # Check if instrument editing is available.
   check_function_exists (lscp_edit_channel_instrument CONFIG_EDIT_INSTRUMENT)
   # Check for CHANNEL_MIDI LSCP event support in liblscp],
-  check_include_file (lscp/event.h CONFIG_EVENT_CHANNEL_MIDI)
+  check_include_file (lscp/event.h HAVE_LSCP_EVENT_H)
+  if (NOT HAVE_LSCP_EVENT_H)
+    set (CONFIG_EVENT_CHANNEL_MIDI 0)
+  else ()
+    set (CONFIG_EVENT_CHANNEL_MIDI 1)    
+  endif ()
   # Check for DEVICE_MIDI LSCP event support in liblscp],
-  check_include_file (lscp/event.h CONFIG_EVENT_DEVICE_MIDI)
+  if (NOT HAVE_LSCP_EVENT_H)
+    set (CONFIG_EVENT_DEVICE_MIDI 0)
+  else ()
+    set (CONFIG_EVENT_DEVICE_MIDI 1)    
+  endif ()
   # Check if max. voices / streams is available.
   check_function_exists (lscp_get_voices CONFIG_MAX_VOICES)
 else ()
   message (FATAL_ERROR "*** LSCP library not found.")
+  set (CONFIG_LIBLSCP 0)
 endif ()
 
 # Check for GIG libraries.
 if (CONFIG_LIBGIG)
   pkg_check_modules (GIG gig>=3.3.0)
-  set (CONFIG_LIBGIG ${GIG_FOUND})
-  if (CONFIG_LIBGIG)
+  if (GIG_FOUND)
     include_directories (${GIG_INCLUDE_DIRS})
     link_directories (${GIG_LIBRARY_DIRS})
     link_libraries (${GIG_LIBRARIES})
@@ -165,9 +191,15 @@
     # liggig supports fast information retrieval.
     set (CONFIG_LIBGIG_SETAUTOLOAD 1)
     # Check if libgig/SF.h is available.
-    check_include_file_cxx (libgig/SF.h CONFIG_LIBGIG_SF2)
+    check_include_file_cxx (libgig/SF.h HAVE_LIBGIG_SF_H)
+    if (NOT HAVE_LIBGIG_SF_H)
+      set (CONFIG_LIBGIG_SF2 0)
+    else ()
+      set (CONFIG_LIBGIG_SF2 1)    
+    endif ()
   else ()
     message (WARNING "*** GIG library not found.")
+    set (CONFIG_LIBGIG 0)
   endif ()
 endif ()