/[svn]/qsampler/trunk/CMakeLists.txt
ViewVC logotype

Diff of /qsampler/trunk/CMakeLists.txt

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3815 by capela, Sun Aug 16 11:48:49 2020 UTC revision 3849 by capela, Thu Jan 7 16:18:02 2021 UTC
# Line 1  Line 1 
1  project(QSAMPLER)  project(qsampler)
2    
3  cmake_minimum_required(VERSION 3.1)  cmake_minimum_required(VERSION 3.1)
4    
5  set (VERSION "0.9.0")  set (VERSION "0.9.1")
6    
7  set (CONFIG_VERSION ${VERSION})  set (CONFIG_VERSION ${VERSION})
8  execute_process (  execute_process (
# Line 12  execute_process ( Line 12  execute_process (
12    OUTPUT_STRIP_TRAILING_WHITESPACE)    OUTPUT_STRIP_TRAILING_WHITESPACE)
13  if (GIT_DESCRIBE_RESULT EQUAL 0)  if (GIT_DESCRIBE_RESULT EQUAL 0)
14    set (VERSION "${GIT_DESCRIBE_OUTPUT}")    set (VERSION "${GIT_DESCRIBE_OUTPUT}")
15    string (REGEX REPLACE "^[^_]+"   "" VERSION "${VERSION}")    string (REGEX REPLACE "^[^0-9]+" "" VERSION "${VERSION}")
   string (REGEX REPLACE "^[_vV]+"  "" VERSION "${VERSION}")  
16    string (REGEX REPLACE "-g"   "git." VERSION "${VERSION}")    string (REGEX REPLACE "-g"   "git." VERSION "${VERSION}")
17    string (REGEX REPLACE "[_|-]+"  "." VERSION "${VERSION}")    string (REGEX REPLACE "[_|-]+"  "." VERSION "${VERSION}")
18    execute_process (    execute_process (
# Line 70  if (POLICY CMP0075) Line 69  if (POLICY CMP0075)
69  endif ()  endif ()
70    
71  # Check for Qt  # Check for Qt
72  find_package (Qt5 REQUIRED COMPONENTS Core Gui Widgets)  find_package (QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
73    find_package (Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets)
74    
75  if (CONFIG_XUNIQUE)  if (CONFIG_XUNIQUE)
76    find_package (Qt5 REQUIRED COMPONENTS Network)    find_package (Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Network)
77  endif ()  endif ()
78    
79  find_package (Qt5LinguistTools)  find_package (Qt${QT_VERSION_MAJOR}LinguistTools)
80    
81  include (CheckIncludeFile)  include (CheckIncludeFile)
82  include (CheckIncludeFiles)  include (CheckIncludeFiles)
Legend:
Removed from v.3815  
changed lines
  Added in v.3849
  ViewVC Help
Powered by ViewVC