mirror of https://github.com/KLayout/klayout.git
Enable Qt6 build from build.sh (gcc needs c++17) and less noisy builds with gcc 11 etc.
This commit is contained in:
parent
a759492f1e
commit
a8ea234522
|
|
@ -124,6 +124,11 @@ public:
|
|||
*/
|
||||
virtual void put (const db::Edge &e);
|
||||
|
||||
/**
|
||||
* @brief Implementation of the EdgeSink interface
|
||||
*/
|
||||
virtual void put (const db::Edge & /*e*/, int /*tag*/) { }
|
||||
|
||||
/**
|
||||
* @brief Sets the way how holes are resolved dynamically
|
||||
*
|
||||
|
|
@ -261,6 +266,11 @@ public:
|
|||
*/
|
||||
virtual void put (const db::Edge &e);
|
||||
|
||||
/**
|
||||
* @brief Implementation of the EdgeSink interface
|
||||
*/
|
||||
virtual void put (const db::Edge & /*e*/, int /*tag*/) { }
|
||||
|
||||
private:
|
||||
db::Coord m_y;
|
||||
PolygonSink *mp_psink;
|
||||
|
|
|
|||
|
|
@ -162,16 +162,25 @@ msvc {
|
|||
QMAKE_CXXFLAGS_WARN_ON += \
|
||||
-pedantic \
|
||||
-Woverloaded-virtual \
|
||||
-Wsign-promo \
|
||||
-Wsynth \
|
||||
-Wno-deprecated \
|
||||
-Wno-long-long \
|
||||
-Wno-strict-aliasing \
|
||||
-Wno-deprecated-declarations \
|
||||
-Wno-reserved-user-defined-literal \
|
||||
|
||||
# because we use unordered_map/unordered_set:
|
||||
QMAKE_CXXFLAGS += -std=c++11
|
||||
# too noisy on Qt:
|
||||
# QMAKE_CXXFLAGS_WARN_ON += \
|
||||
# -Wsign-promo \
|
||||
# -Wno-reserved-user-defined-literal \
|
||||
#
|
||||
|
||||
lessThan(QT_MAJOR_VERSION, 6) {
|
||||
# because we use unordered_map/unordered_set:
|
||||
QMAKE_CXXFLAGS += -std=c++11
|
||||
} else {
|
||||
# because we use unordered_map/unordered_set:
|
||||
QMAKE_CXXFLAGS += -std=c++17
|
||||
}
|
||||
|
||||
win32 {
|
||||
|
||||
|
|
|
|||
|
|
@ -53,13 +53,13 @@ private:
|
|||
std::string m_text;
|
||||
};
|
||||
|
||||
#if defined(HAVE_RUBY)
|
||||
|
||||
static std::string np (const std::string &s)
|
||||
{
|
||||
return tl::replaced (s, "\\", "/");
|
||||
}
|
||||
|
||||
#if defined(HAVE_RUBY)
|
||||
|
||||
TEST(1_BasicRuby)
|
||||
{
|
||||
tl_assert (rba::RubyInterpreter::instance () != 0);
|
||||
|
|
|
|||
Loading…
Reference in New Issue