Mercurial > mxe-octave

annotate src/cgal-1-fixes.patch @ 6082:480f60641fc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add openlibm * src/openlibm.mk: new file * index.html, dist-files.mk: add ref to new file
author John Donoghue <john.donoghue@ieee.org>
date Wed, 09 Feb 2022 09:56:44 -0500
parents 5b3f762006d3
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5917
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
1 This file is part of MXE. See LICENSE.md for licensing information.
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
2
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
3 Contains ad hoc patches for cross building.
2028
457e41afeed7 style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4
5917
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
5 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
6 From: Tony Theodore <tonyt@logyst.com>
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
7 Date: Mon, 20 Nov 2017 10:25:44 +1100
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
8 Subject: [PATCH 1/1] fix boost linking errors
2028
457e41afeed7 style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
9
457e41afeed7 style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10
5917
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
11 diff --git a/src/CGAL/CMakeLists.txt b/src/CGAL/CMakeLists.txt
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
12 index 1111111..2222222 100644
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
13 --- a/src/CGAL/CMakeLists.txt
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
14 +++ b/src/CGAL/CMakeLists.txt
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
15 @@ -2,6 +2,14 @@ message("Configuring libCGAL")
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
16
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
17 use_essential_libs()
2028
457e41afeed7 style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18
5917
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
19 +# same as src/CGAL_Core/CMakeLists.txt
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
20 +if (NOT MSVC)
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
21 + # See the release notes of CGAL-4.10: CGAL_Core now requires
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
22 + # Boost.Thread, with all compilers but MSVC.
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
23 + find_package( Boost 1.48 REQUIRED thread system )
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
24 + cache_set(CGAL_3RD_PARTY_LIBRARIES ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES} )
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
25 +endif(NOT MSVC)
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
26 +
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
27 include_directories (SYSTEM ${CGAL_3RD_PARTY_INCLUDE_DIRS})
2028
457e41afeed7 style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28
5917
5b3f762006d3 cgal: update to v4.11, use github
John Donoghue <john.donoghue@ieee.org>
parents: 2669
diff changeset
29 add_definitions(${CGAL_3RD_PARTY_DEFINITIONS})