Skip to content
Permalink
Browse files

fix msvc build

  • Loading branch information
jef-n committed Apr 21, 2021
1 parent b31e01b commit e3f16292eaeebfdcd26511f3eee154ea63277c62
Showing with 5 additions and 5 deletions.
  1. +2 −2 CMakeLists.txt
  2. +3 −3 src/core/settings/qgssettingsentry.h
@@ -681,8 +681,8 @@ else()
endif()

if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8 /std:c++17")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8 /std:c++17")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
# disable macros that offend std::numeric_limits<T>::min()/max()
@@ -857,7 +857,7 @@ class CORE_EXPORT QgsSettingsEntryDouble : public QgsSettingsEntryBase
* \since QGIS 3.20
*/
template <typename T>
class CORE_EXPORT QgsSettingsEntryEnumFlagBase : public QgsSettingsEntryBase
class QgsSettingsEntryEnumFlagBase : public QgsSettingsEntryBase
{
public:

@@ -1014,7 +1014,7 @@ class CORE_EXPORT QgsSettingsEntryEnumFlagBase : public QgsSettingsEntryBase
* \since QGIS 3.20
*/
template <typename T>
class CORE_EXPORT QgsSettingsEntryEnum : public QgsSettingsEntryEnumFlagBase<T>
class QgsSettingsEntryEnum : public QgsSettingsEntryEnumFlagBase<T>
{
public:

@@ -1058,7 +1058,7 @@ class CORE_EXPORT QgsSettingsEntryEnum : public QgsSettingsEntryEnumFlagBase<T>
* \since QGIS 3.20
*/
template <typename T>
class CORE_EXPORT QgsSettingsEntryFlag : public QgsSettingsEntryEnumFlagBase<T>
class QgsSettingsEntryFlag : public QgsSettingsEntryEnumFlagBase<T>
{
public:

0 comments on commit e3f1629

Please sign in to comment.