--- qsampler/trunk/CMakeLists.txt	2019/08/25 21:47:56	3569
+++ qsampler/trunk/CMakeLists.txt	2019/10/17 14:09:09	3633
@@ -1,9 +1,10 @@
 project(QSAMPLER)
 
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.1)
 
-set (VERSION "0.5.7")
+set (VERSION "0.6.0")
 
+set (CONFIG_VERSION ${VERSION})
 execute_process (
   COMMAND git describe --tags --dirty --abbrev=6
   OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
@@ -11,7 +12,7 @@
   OUTPUT_STRIP_TRAILING_WHITESPACE)
 if (GIT_DESCRIBE_RESULT EQUAL 0)
   set (VERSION "${GIT_DESCRIBE_OUTPUT}")
-  string (REGEX REPLACE "^[^_vV]+" "" VERSION "${VERSION}")
+  string (REGEX REPLACE "^[^_]+"   "" VERSION "${VERSION}")
   string (REGEX REPLACE "^[_vV]+"  "" VERSION "${VERSION}")
   string (REGEX REPLACE "-g"   "git." VERSION "${VERSION}")
   string (REGEX REPLACE "[_|-]+"  "." VERSION "${VERSION}")
@@ -22,7 +23,7 @@
     OUTPUT_STRIP_TRAILING_WHITESPACE)
   if (GIT_REVPARSE_RESULT EQUAL 0 AND NOT GIT_REVPARSE_OUTPUT STREQUAL "master")
     set (VERSION "${VERSION} [${GIT_REVPARSE_OUTPUT}]")
-  endif ()  
+  endif ()
 endif ()
 
 set (PACKAGE_NAME "Qsampler")
@@ -34,17 +35,24 @@
 set (CONFIG_BUILD_VERSION "${PACKAGE_VERSION}")
 
 if (CMAKE_BUILD_TYPE)
-  set (CONFIG_BUILD_TYPE CMAKE_BUILD_TYPE)
+  set (CONFIG_BUILD_TYPE ${CMAKE_BUILD_TYPE})
 else ()
   set (CONFIG_BUILD_TYPE "release")
 endif ()
 
-set (CONFIG_DEBUG)
+set (CONFIG_DEBUG 0)
 if (CONFIG_BUILD_TYPE MATCHES "debug")
-  set(CONFIG_DEBUG 1)
+  set (CONFIG_DEBUG 1)
 endif ()
+
 set (CONFIG_PREFIX "${CMAKE_INSTALL_PREFIX}")
 
+include (GNUInstallDirs)
+set (CONFIG_BINDIR  "${CONFIG_PREFIX}/${CMAKE_INSTALL_BINDIR}")
+set (CONFIG_LIBDIR  "${CONFIG_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+set (CONFIG_DATADIR "${CONFIG_PREFIX}/${CMAKE_INSTALL_DATADIR}")
+set (CONFIG_MANDIR  "${CONFIG_PREFIX}/${CMAKE_INSTALL_MANDIR}")
+
 
 # Enable libgig availability.
 option (CONFIG_LIBGIG "Enable libgig interface (default=yes)" 1)
@@ -55,21 +63,21 @@
 # Enable debugger stack-trace option (assumes --enable-debug).
 option (CONFIG_STACKTRACE "Enable debugger stack-trace (default=no)" 0)
 
+
 # Fix for new CMAKE_REQUIRED_LIBRARIES policy.
 if (POLICY CMP0075)
   cmake_policy (SET CMP0075 NEW)
 endif ()
 
 # Check for Qt
-find_package (Qt5 REQUIRED NO_MODULE COMPONENTS Core Gui Widgets)
+find_package (Qt5 REQUIRED COMPONENTS Core Gui Widgets)
 
 if (CONFIG_XUNIQUE)
-  find_package (Qt5 REQUIRED NO_MODULE COMPONENTS Network)
+  find_package (Qt5 REQUIRED COMPONENTS Network)
 endif ()
 
 find_package (Qt5LinguistTools)
 
-include (GNUInstallDirs)
 include (CheckIncludeFile)
 include (CheckIncludeFiles)
 include (CheckIncludeFileCXX)
@@ -105,6 +113,7 @@
 if (CONFIG_LIBLSCP)
   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)
@@ -173,9 +182,9 @@
 # Configuration status
 macro (SHOW_OPTION text value)
   if (${value})
-    message("${text}: yes")
+    message ("${text}: yes")
   else ()
-    message("${text}: no")
+    message ("${text}: no")
   endif ()
 endmacro ()