Fix build windows build with Qt 5.9.1

CMake, however, complains with:

CMake Error in CMakeLists.txt:
No known features for CXX compiler
"GNU"
version 5.3.0.

...but the build still passes, so...
This commit is contained in:
CDrummond
2017-07-09 16:04:49 +01:00
committed by CDrummond
parent 0b3a56fe7f
commit 9dda048aa2
2 changed files with 10 additions and 3 deletions

View File

@@ -19,7 +19,7 @@ else ()
endif ()
cmake_minimum_required(VERSION 2.6)
cmake_policy(SET CMP0020 OLD)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
@@ -113,8 +113,10 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND NOT APPLE AND NOT WIN32)
endif ()
if (ENABLE_TAGLIB)
set(TAGLIB_MIN_VERSION "1.6")
find_package(Taglib)
if (TAGLIB_FOUND)
set(TAGLIB_MIN_VERSION "1.6")
find_package(Taglib)
endif()
macro_log_feature(TAGLIB_FOUND "TagLib" "Tag editor, file organiser, etc." "http://taglib.github.io/")
endif ()
@@ -212,6 +214,7 @@ find_package(Qt5Svg REQUIRED)
find_package(Qt5Sql REQUIRED)
if (${Qt5Widgets_VERSION} VERSION_GREATER "5.6.99")
set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_STANDARD "11")
endif ()

View File

@@ -183,6 +183,8 @@ section "install"
file "translations\cantata_es.qm"
file "translations\cantata_fr.qm"
file "translations\cantata_hu.qm"
file "translations\cantata_it.qm"
file "translations\cantata_ja.qm"
file "translations\cantata_ko.qm"
file "translations\cantata_pl.qm"
file "translations\cantata_ru.qm"
@@ -595,6 +597,8 @@ section "uninstall"
delete "$INSTDIR\translations\cantata_es.qm"
delete "$INSTDIR\translations\cantata_fr.qm"
delete "$INSTDIR\translations\cantata_hu.qm"
delete "$INSTDIR\translations\cantata_it.qm"
delete "$INSTDIR\translations\cantata_ja.qm"
delete "$INSTDIR\translations\cantata_ko.qm"
delete "$INSTDIR\translations\cantata_pl.qm"
delete "$INSTDIR\translations\cantata_ru.qm"