Skip to content

Commit 51fc00b

Browse files
committed
unused notice eliminate and do not set shared library prefix on MinGW
1 parent aa9bf31 commit 51fc00b

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

CMakeLists.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,14 @@ if (WIN32)
3636
elseif (ANDROID)
3737
set(RMESSENTIALS_QT5_COMPONENTS ${RMESSENTIALS_QT5_COMPONENTS} AndroidExtras)
3838
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)
4141

4242
if (NOT (Qt5_FOUND OR Qt6_FOUND))
4343
message(FATAL_ERROR "at least one of Qt 5 and Qt 6 is needed")
4444
endif()
4545

4646
if (Qt6_FOUND)
47-
message("Using Qt6")
4847
if (NOT Qt6Core5Compat_FOUND)
4948
set(RMESSENTIALS_USE_QUAZIP false)
5049
if (RMESSENTIALS_FORCE_USE_QUAZIP)
@@ -53,14 +52,16 @@ if (Qt6_FOUND)
5352
else()
5453
endif()
5554
endif()
56-
if (Qt5_FOUND)
57-
message("Using Qt5")
58-
endif()
5955

6056
if(RMESSENTIALS_USE_QUAZIP)
6157
set(RMESSENTIALS_QUAZIP_VERSION "1.4")
6258
endif()
6359

60+
if (WIN32)
61+
set(CMAKE_SHARED_LIBRARY_PREFIX "")
62+
set(CMAKE_SHARED_MODULE_PREFIX "")
63+
endif()
64+
6465
if (WIN32)
6566
get_filename_component(RMESSENTIALS_RC_IN_FILE "res/RMEssentials.rc.in" REALPATH BASE_DIR "${CMAKE_CURRENT_LIST_DIR}")
6667
get_filename_component(RMESSENTIALS_RC_ICON "res/RMEssentials.ico" REALPATH BASE_DIR "${CMAKE_CURRENT_LIST_DIR}")

0 commit comments

Comments
 (0)