diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-07-15 12:17:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-15 12:17:16 (GMT) |
| commit | 6f830ee8f2fce5a46aad3ad67334f60a66ed6a22 (patch) | |
| tree | f2bb508e1c755084ed53044338da58262223ee43 | |
| parent | 837e5e705c60bb298bcc5884c77330e318923178 (diff) | |
| parent | 8901059de70d8c521734b5be514d7ecf7a41ba63 (diff) | |
| download | mxe-6f830ee8f2fce5a46aad3ad67334f60a66ed6a22.zip mxe-6f830ee8f2fce5a46aad3ad67334f60a66ed6a22.tar.gz mxe-6f830ee8f2fce5a46aad3ad67334f60a66ed6a22.tar.bz2 | |
Merge pull request #1438 from LuaAndC/cgal-static
cgal: build static libraries for static targets
| -rw-r--r-- | src/cgal.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cgal.mk b/src/cgal.mk index cae0b1c..6aeca03 100644 --- a/src/cgal.mk +++ b/src/cgal.mk @@ -23,7 +23,7 @@ define $(PKG)_BUILD -DCGAL_INSTALL_INC_DIR:STRING="include" \ -DCGAL_INSTALL_DOC_DIR:STRING="share/doc/CGAL-$($(PKG)_VERSION)" \ -DCGAL_INSTALL_BIN_DIR:STRING="bin" \ - -DCGAL_BUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \ + -DBUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \ -DCGAL_Boost_USE_STATIC_LIBS:BOOL=$(CMAKE_STATIC_BOOL) \ -DWITH_CGAL_Qt3:BOOL=OFF \ -DWITH_OpenGL:BOOL=ON \ @@ -31,7 +31,7 @@ define $(PKG)_BUILD -C '$(PWD)/src/cgal-TryRunResults.cmake' . $(MAKE) -C '$(1)' -j $(JOBS) - $(MAKE) -C '$(1)' -j $(JOBS) install + $(MAKE) -C '$(1)' -j 1 install cd '$(1)/examples/AABB_tree' && '$(TARGET)-cmake' \ -DWITH_CGAL_Qt3:BOOL=OFF \ |