From 5e5e69013b41ef4c84155935f63fe49f8aa49f0c Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 14 Feb 2022 12:41:07 +0100 Subject: [PATCH] Sketcher: fix linking errors with Conda builds --- src/Mod/Sketcher/App/GeoEnum.cpp | 4 ++++ src/Mod/Sketcher/App/GeoEnum.h | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Mod/Sketcher/App/GeoEnum.cpp b/src/Mod/Sketcher/App/GeoEnum.cpp index cb3cd4f83d..8ea033fcc7 100644 --- a/src/Mod/Sketcher/App/GeoEnum.cpp +++ b/src/Mod/Sketcher/App/GeoEnum.cpp @@ -35,3 +35,7 @@ bool GeoElementId::operator!=(const GeoElementId& obj) const { return this->GeoId != obj.GeoId || this->Pos != obj.Pos; } + +constexpr const GeoElementId GeoElementId::RtPnt = GeoElementId(GeoEnum::RtPnt, PointPos::start); +constexpr const GeoElementId GeoElementId::HAxis = GeoElementId(GeoEnum::HAxis, PointPos::none); +constexpr const GeoElementId GeoElementId::VAxis = GeoElementId(GeoEnum::VAxis, PointPos::end); diff --git a/src/Mod/Sketcher/App/GeoEnum.h b/src/Mod/Sketcher/App/GeoEnum.h index df594c3a62..af205e754d 100644 --- a/src/Mod/Sketcher/App/GeoEnum.h +++ b/src/Mod/Sketcher/App/GeoEnum.h @@ -24,6 +24,7 @@ #define SKETCHER_GeoEnum_H #include +#include namespace Sketcher { @@ -96,7 +97,7 @@ enum class PointPos : int { * ordered containers. * */ -class GeoElementId +class SketcherExport GeoElementId { public: /** @brief default constructor initialises object to an undefined (invalid) element. @@ -134,10 +135,6 @@ inline constexpr GeoElementId::GeoElementId(int geoId, PointPos pos): GeoId(geoI { } -inline constexpr const GeoElementId GeoElementId::RtPnt = GeoElementId(GeoEnum::RtPnt, PointPos::start); -inline constexpr const GeoElementId GeoElementId::HAxis = GeoElementId(GeoEnum::HAxis, PointPos::none); -inline constexpr const GeoElementId GeoElementId::VAxis = GeoElementId(GeoEnum::VAxis, PointPos::end); - } // namespace Sketcher namespace std