Mercurial > mxe-octave

comparison src/cgal.mk @ 5571:b19fb3ed330c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use cmake command line to set build shared/static options (bug #59373) * Makefile.in (CMAKE_BUILD_SHARED_OR_STATIC): New variable. (build-cmake-toolchain-file): Don't define BUILD_SHARED_LIBS or BUILD_STATIC_LIBS in the toolchain file. * armadillo.mk, cgal.mk, cmake.mk, cminpack.mk, double-conversion.mk, eigen.mk, gdcm.mk, gl2ps.mk, hdf5.mk, lapack.mk, libical.mk, libproxy.mk, of-dicom.mk, openal.mk, opencv.mk, openexr.mk, openscenegraph.mk, physfs.mk, qhull.mk, qjson.mk, rapidjson.mk, suitesparse.mk, sundials-ida.mk, taglib.mk, vigra.mk, vmime.mk, vtk.mk, wt.mk: Use $(CMAKE_BUILD_SHARED_OR_STATIC) on the cmake command line.
author John W. Eaton <jwe@octave.org>
date Fri, 30 Oct 2020 10:06:00 -0400
parents d862fd40cc42
children 5b3f762006d3
comparison
equal deleted inserted replaced
5570:e50a3ed99da0 5571:b19fb3ed330c
24 -DCGAL_INSTALL_DOC_DIR:STRING="share/doc/CGAL-3.9" \ 24 -DCGAL_INSTALL_DOC_DIR:STRING="share/doc/CGAL-3.9" \
25 -DCGAL_INSTALL_BIN_DIR:STRING="bin" \ 25 -DCGAL_INSTALL_BIN_DIR:STRING="bin" \
26 -DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \ 26 -DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \
27 -DWITH_CGAL_Qt3:BOOL="0" \ 27 -DWITH_CGAL_Qt3:BOOL="0" \
28 $(CMAKE_CCACHE_FLAGS) \ 28 $(CMAKE_CCACHE_FLAGS) \
29 $(CMAKE_BUILD_SHARED_OR_STATIC) \
29 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ 30 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
30 -DBOOST_COMPILER=_win32 \ 31 -DBOOST_COMPILER=_win32 \
31 -DBOOST_THREAD_USE_LIB=1 \ 32 -DBOOST_THREAD_USE_LIB=1 \
32 -DBOOST_USE_STATIC_LIBS=1 \ 33 -DBOOST_USE_STATIC_LIBS=1 \
33 -DBUILD_SHARED_LIBS=0 \ 34 -DBUILD_SHARED_LIBS=0 \
36 37
37 cd '$(1)/examples/AABB_tree' && cmake \ 38 cd '$(1)/examples/AABB_tree' && cmake \
38 -DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \ 39 -DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \
39 -DWITH_CGAL_Qt3:BOOL="0" \ 40 -DWITH_CGAL_Qt3:BOOL="0" \
40 $(CMAKE_CCACHE_FLAGS) \ 41 $(CMAKE_CCACHE_FLAGS) \
42 $(CMAKE_BUILD_SHARED_OR_STATIC) \
41 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ 43 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
42 -DBOOST_COMPILER=_win32 \ 44 -DBOOST_COMPILER=_win32 \
43 -DBOOST_THREAD_USE_LIB=1 \ 45 -DBOOST_THREAD_USE_LIB=1 \
44 -DBOOST_USE_STATIC_LIBS=1 \ 46 -DBOOST_USE_STATIC_LIBS=1 \
45 -DBUILD_SHARED_LIBS=0 \ 47 -DBUILD_SHARED_LIBS=0 \