Skip to content

Commit

Permalink
Patch for MIPS64 Architecture
Browse files Browse the repository at this point in the history
  • Loading branch information
ibrep authored and wwmayer committed Feb 15, 2020
1 parent 5f7856d commit 0bef3cd
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 1 deletion.
Expand Up @@ -13,7 +13,11 @@ macro(SetGlobalCompilerAndLinkerSettings)
message(STATUS "Platform is 32-bit")
endif(CMAKE_SIZEOF_VOID_P EQUAL 8)


# check for mips64 platform
if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "mips64")

This comment has been minimized.

Copy link
@looooo

looooo Feb 16, 2020

Contributor

conda linux failing with:

CMake Error at cMake/FreeCAD_Helpers/SetGlobalCompilerAndLinkerSettings.cmake:17 (if):
  if given arguments:

    "STREQUAL" "mips64"

  Unknown arguments specified
Call Stack (most recent call first):
  CMakeLists.txt:87 (SetGlobalCompilerAndLinkerSettings)

This comment has been minimized.

Copy link
@wwmayer

wwmayer Feb 17, 2020

Contributor

Does it help to write

if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "mips64")

In FreeCAD's cmake files we have a dozen of occurrences of the form if (variable STREQUAL "string") and conda never complained about them. Why on this now?

This comment has been minimized.

Copy link
@looooo

looooo Feb 17, 2020

Contributor

CMAKE_SYSTEM_PROCESSOR is empty (conda linux). I will try your suggestion and report back, thanks

This comment has been minimized.

Copy link
@looooo

looooo Feb 17, 2020

Contributor

your suggestion works. I guess it's best if you do this modification directly. thanks

This comment has been minimized.

Copy link
@wwmayer

wwmayer Feb 17, 2020

Contributor
message(STATUS "Architecture: mips64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mxgot")
endif()

if(MSVC)
# set default compiler settings
Expand Down
1 change: 1 addition & 0 deletions src/Mod/Inspection/App/InspectionFeature.cpp
Expand Up @@ -22,6 +22,7 @@


#include "PreCompiled.h"
#include <numeric>
#include <gp_Pnt.hxx>
#include <BRepExtrema_DistShapeShape.hxx>
#include <BRepBuilderAPI_MakeVertex.hxx>
Expand Down
1 change: 1 addition & 0 deletions src/Mod/Part/App/GeometryCurvePyImp.cpp
Expand Up @@ -54,6 +54,7 @@
# include <ShapeConstruct_Curve.hxx>
# include <GeomAPI_IntCS.hxx>
# include <GeomAPI_ExtremaCurveCurve.hxx>
# include <IntRes2d_IntersectionSegment.hxx>
#endif

#include <Base/GeometryPyCXX.h>
Expand Down
1 change: 1 addition & 0 deletions src/Mod/Part/App/Part2DObject.cpp
Expand Up @@ -37,6 +37,7 @@
# include <Geom2dAPI_ProjectPointOnCurve.hxx>
# include <GeomAPI.hxx>
# include <BRepAdaptor_Surface.hxx>
# include <IntRes2d_IntersectionSegment.hxx>
#endif

#ifndef M_PI
Expand Down

0 comments on commit 0bef3cd

Please sign in to comment.