--- qsampler/trunk/CMakeLists.txt 2021/03/27 12:27:37 3867 +++ qsampler/trunk/CMakeLists.txt 2021/03/30 23:31:09 3868 @@ -74,8 +74,14 @@ cmake_policy (SET CMP0075 NEW) endif () -# Check for Qt -find_package (QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) +# Check for Qt... +find_package (Qt6 QUIET) +if (Qt6_FOUND) + find_package (QT QUIET NAMES Qt6) +else () + find_package (QT QUIET NAMES Qt5) +endif () + find_package (Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets) if (CONFIG_XUNIQUE) @@ -227,7 +233,7 @@ endmacro () -message ("\n ${PACKAGE_NAME} ${PACKAGE_VERSION}") +message ("\n ${PACKAGE_NAME} ${PACKAGE_VERSION} (Qt ${QT_VERSION})") message ("\n Build target . . . . . . . . . . . . . . . . . . .: ${CONFIG_BUILD_TYPE}\n") show_option (" LSCP instrument name support . . . . . . . . . . ." CONFIG_INSTRUMENT_NAME) show_option (" LSCP mute/solo support . . . . . . . . . . . . . ." CONFIG_MUTE_SOLO)