--- qsampler/trunk/CMakeLists.txt	2019/11/13 19:46:13	3640
+++ qsampler/trunk/CMakeLists.txt	2020/12/14 15:49:17	3841
@@ -1,8 +1,8 @@
-project(QSAMPLER)
+project(qsampler)
 
 cmake_minimum_required(VERSION 3.1)
 
-set (VERSION "0.6.1")
+set (VERSION "0.9.0")
 
 set (CONFIG_VERSION ${VERSION})
 execute_process (
@@ -12,8 +12,7 @@
   OUTPUT_STRIP_TRAILING_WHITESPACE)
 if (GIT_DESCRIBE_RESULT EQUAL 0)
   set (VERSION "${GIT_DESCRIBE_OUTPUT}")
-  string (REGEX REPLACE "^[^_]+"   "" VERSION "${VERSION}")
-  string (REGEX REPLACE "^[_vV]+"  "" VERSION "${VERSION}")
+  string (REGEX REPLACE "^[^0-9]+" "" VERSION "${VERSION}")
   string (REGEX REPLACE "-g"   "git." VERSION "${VERSION}")
   string (REGEX REPLACE "[_|-]+"  "." VERSION "${VERSION}")
   execute_process (
@@ -70,13 +69,14 @@
 endif ()
 
 # Check for Qt
-find_package (Qt5 REQUIRED COMPONENTS Core Gui Widgets)
+find_package (QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
+find_package (Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets)
 
 if (CONFIG_XUNIQUE)
-  find_package (Qt5 REQUIRED COMPONENTS Network)
+  find_package (Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Network)
 endif ()
 
-find_package (Qt5LinguistTools)
+find_package (Qt${QT_VERSION_MAJOR}LinguistTools)
 
 include (CheckIncludeFile)
 include (CheckIncludeFiles)
@@ -109,8 +109,8 @@
 
 # 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})
@@ -177,13 +177,13 @@
   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})
@@ -199,6 +199,7 @@
     endif ()
   else ()
     message (WARNING "*** GIG library not found.")
+    set (CONFIG_LIBGIG 0)
   endif ()
 endif ()