kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Sketcher: fix linking errors with Conda builds

Browse Source
This commit is contained in:
wmayer
2022-02-14 12:41:07 +01:00
parent 19b89b1085
commit 5e5e69013b
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Sketcher/App/GeoEnum.cpp
View File

@@ -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);

7
src/Mod/Sketcher/App/GeoEnum.h
View File

@@ -24,6 +24,7 @@
#define SKETCHER_GeoEnum_H
#include <functional>
#include <Mod/Sketcher/SketcherGlobal.h>
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