From 85b61638d258383ee2353643461eed3a80185c2f Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Thu, 8 Sep 2016 12:17:38 +0000 Subject: (Readdition of cad/freecad which was removed on 235718) Add freecad 0.17.g20160907, general purpose 3D CAD modeller. PR: 212251 Submitted by: pfg --- .../patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp | 11 +++++++++++ cad/freecad/files/patch-src_Gui_CMakeLists.txt | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 cad/freecad/files/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp create mode 100644 cad/freecad/files/patch-src_Gui_CMakeLists.txt (limited to 'cad/freecad/files') diff --git a/cad/freecad/files/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp b/cad/freecad/files/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp new file mode 100644 index 000000000000..ca0fbdbc6a03 --- /dev/null +++ b/cad/freecad/files/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp @@ -0,0 +1,11 @@ +--- src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp.orig 2016-09-07 14:39:54 UTC ++++ src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp +@@ -57,7 +57,7 @@ + using namespace std; + + #ifndef WIN32 +-#if !(defined(__MACH__) && defined(__APPLE__)) ++#ifdef __linux__ + #include + #endif + #include diff --git a/cad/freecad/files/patch-src_Gui_CMakeLists.txt b/cad/freecad/files/patch-src_Gui_CMakeLists.txt new file mode 100644 index 000000000000..b29aa2bcc26e --- /dev/null +++ b/cad/freecad/files/patch-src_Gui_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/Gui/CMakeLists.txt.orig 2016-09-07 14:39:54 UTC ++++ src/Gui/CMakeLists.txt +@@ -57,7 +57,7 @@ else(MSVC) + ${COIN3D_LIBRARIES} + ${QT_LIBRARIES} + ${Boost_LIBRARIES} +- ${OPENGL_gl_LIBRARY} ++ ${OPENGL_gl_LIBRARY} -L%%LOCALBASE%%/lib + ${3DCONNEXION_LINKFLAGS} + ) + endif(MSVC) -- cgit v1.2.3