File tree Expand file tree Collapse file tree 1 file changed +7
-6
lines changed Expand file tree Collapse file tree 1 file changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -36,15 +36,14 @@ if (WIN32)
36
36
elseif (ANDROID )
37
37
set (RMESSENTIALS_QT5_COMPONENTS ${RMESSENTIALS_QT5_COMPONENTS} AndroidExtras )
38
38
endif ()
39
- find_package (Qt6 COMPONENTS ${RMESSENTIALS_QT6_COMPONENTS} OPTIONAL_COMPONENTS ZlibPrivate Core5Compat )
40
- find_package (Qt5 5.15 COMPONENTS ${RMESSENTIALS_QT5_COMPONENTS} OPTIONAL_COMPONENTS Zlib )
39
+ find_package (Qt6 6.2 QUIET COMPONENTS ${RMESSENTIALS_QT6_COMPONENTS} OPTIONAL_COMPONENTS ZlibPrivate Core5Compat )
40
+ find_package (Qt5 5.15 QUIET COMPONENTS ${RMESSENTIALS_QT5_COMPONENTS} OPTIONAL_COMPONENTS Zlib )
41
41
42
42
if (NOT (Qt5_FOUND OR Qt6_FOUND ))
43
43
message (FATAL_ERROR "at least one of Qt 5 and Qt 6 is needed" )
44
44
endif ()
45
45
46
46
if (Qt6_FOUND )
47
- message ("Using Qt6" )
48
47
if (NOT Qt6Core5Compat_FOUND )
49
48
set (RMESSENTIALS_USE_QUAZIP false )
50
49
if (RMESSENTIALS_FORCE_USE_QUAZIP )
@@ -53,14 +52,16 @@ if (Qt6_FOUND)
53
52
else ()
54
53
endif ()
55
54
endif ()
56
- if (Qt5_FOUND )
57
- message ("Using Qt5" )
58
- endif ()
59
55
60
56
if (RMESSENTIALS_USE_QUAZIP )
61
57
set (RMESSENTIALS_QUAZIP_VERSION "1.4" )
62
58
endif ()
63
59
60
+ if (WIN32 )
61
+ set (CMAKE_SHARED_LIBRARY_PREFIX "" )
62
+ set (CMAKE_SHARED_MODULE_PREFIX "" )
63
+ endif ()
64
+
64
65
if (WIN32 )
65
66
get_filename_component (RMESSENTIALS_RC_IN_FILE "res/RMEssentials.rc.in" REALPATH BASE_DIR "${CMAKE_CURRENT_LIST_DIR} " )
66
67
get_filename_component (RMESSENTIALS_RC_ICON "res/RMEssentials.ico" REALPATH BASE_DIR "${CMAKE_CURRENT_LIST_DIR} " )
You can’t perform that action at this time.
0 commit comments