/[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 3868 by capela, Tue Mar 30 23:31:09 2021 UTC revision 3871 by capela, Mon Apr 12 14:05:07 2021 UTC
# Line 8  project(qsampler Line 8  project(qsampler
8  set (CONFIG_VERSION ${PROJECT_VERSION})  set (CONFIG_VERSION ${PROJECT_VERSION})
9  execute_process (  execute_process (
10    COMMAND git describe --tags --dirty --abbrev=6    COMMAND git describe --tags --dirty --abbrev=6
11      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
12    OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT    OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
13    RESULT_VARIABLE GIT_DESCRIBE_RESULT    RESULT_VARIABLE GIT_DESCRIBE_RESULT
14    OUTPUT_STRIP_TRAILING_WHITESPACE)    OUTPUT_STRIP_TRAILING_WHITESPACE)
# Line 18  if (GIT_DESCRIBE_RESULT EQUAL 0) Line 19  if (GIT_DESCRIBE_RESULT EQUAL 0)
19    string (REGEX REPLACE "[_|-]+"  "." VERSION "${VERSION}")    string (REGEX REPLACE "[_|-]+"  "." VERSION "${VERSION}")
20    execute_process (    execute_process (
21      COMMAND git rev-parse --abbrev-ref HEAD      COMMAND git rev-parse --abbrev-ref HEAD
22        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
23      OUTPUT_VARIABLE GIT_REVPARSE_OUTPUT      OUTPUT_VARIABLE GIT_REVPARSE_OUTPUT
24      RESULT_VARIABLE GIT_REVPARSE_RESULT      RESULT_VARIABLE GIT_REVPARSE_RESULT
25      OUTPUT_STRIP_TRAILING_WHITESPACE)      OUTPUT_STRIP_TRAILING_WHITESPACE)
# Line 69  option (CONFIG_XUNIQUE "Enable unique/si Line 71  option (CONFIG_XUNIQUE "Enable unique/si
71  option (CONFIG_STACKTRACE "Enable debugger stack-trace (default=no)" 0)  option (CONFIG_STACKTRACE "Enable debugger stack-trace (default=no)" 0)
72    
73    
74    # Enable Qt6 build preference.
75    option (CONFIG_QT6 "Enable Qt6 build (default=no)" 0)
76    
77    
78  # Fix for new CMAKE_REQUIRED_LIBRARIES policy.  # Fix for new CMAKE_REQUIRED_LIBRARIES policy.
79  if (POLICY CMP0075)  if (POLICY CMP0075)
80    cmake_policy (SET CMP0075 NEW)    cmake_policy (SET CMP0075 NEW)
81  endif ()  endif ()
82    
83  # Check for Qt...  # Check for Qt...
84  find_package (Qt6 QUIET)  if (CONFIG_QT6)
85  if (Qt6_FOUND)    find_package (Qt6 QUIET)
86      if (NOT Qt6_FOUND)
87        set (CONFIG_QT6 0)
88      endif ()
89    endif ()
90    
91    if (CONFIG_QT6)
92    find_package (QT QUIET NAMES Qt6)    find_package (QT QUIET NAMES Qt6)
93  else ()  else ()
94    find_package (QT QUIET NAMES Qt5)    find_package (QT QUIET NAMES Qt5)
Legend:
Removed from v.3868  
changed lines
  Added in v.3871
  ViewVC Help
Powered by ViewVC