diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-07-26 11:20:44 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-26 11:20:44 (GMT) |
| commit | f7ba95fc018664fe14ecd63fd60b93bf79068182 (patch) | |
| tree | 7e1779640acde3986e6c9a67c4f6b31bd3f7dd61 /src/cgal-1-fixes.patch | |
| parent | 398e316829e7bbf267b0652395f364f7b70b2362 (diff) | |
| parent | 52195ec78243d4dd38d384cca191df04478342ed (diff) | |
| download | mxe-f7ba95fc018664fe14ecd63fd60b93bf79068182.zip mxe-f7ba95fc018664fe14ecd63fd60b93bf79068182.tar.gz mxe-f7ba95fc018664fe14ecd63fd60b93bf79068182.tar.bz2 | |
Merge pull request #1859 from tonytheodore/ClearCorrect-cgal_4_10
Updated cgal to 4.10.
Diffstat (limited to 'src/cgal-1-fixes.patch')
| -rw-r--r-- | src/cgal-1-fixes.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/src/cgal-1-fixes.patch b/src/cgal-1-fixes.patch new file mode 100644 index 0000000..dc8c3c2 --- /dev/null +++ b/src/cgal-1-fixes.patch @@ -0,0 +1,37 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Wed, 26 Jul 2017 18:34:16 +1000 +Subject: [PATCH] link examples with boost libraries + + +diff --git a/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake b/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake +index 1111111..2222222 100644 +--- a/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake ++++ b/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake +@@ -1,6 +1,8 @@ + include(CGAL_add_test) + include(CMakeParseArguments) + ++find_package(Boost COMPONENTS system thread REQUIRED) ++ + function(create_single_source_cgal_program firstfile ) + set(options NO_TESTING) + set(oneValueArgs) +@@ -61,11 +63,11 @@ function(create_single_source_cgal_program firstfile ) + # Link the executable to CGAL and third-party libraries + if ( CGAL_AUTO_LINK_ENABLED ) + +- target_link_libraries(${exe_name} ${CGAL_3RD_PARTY_LIBRARIES} ) ++ target_link_libraries(${exe_name} ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES} ) + + else() + +- target_link_libraries(${exe_name} ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ) ++ target_link_libraries(${exe_name} ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES} ) + + endif() + else() |