Mercurial > mxe-octave

comparison src/vtk.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
comparison
equal deleted inserted replaced
5570:e50a3ed99da0 5571:b19fb3ed330c
21 21
22 # first we need a native build to create the compile tools 22 # first we need a native build to create the compile tools
23 mkdir '$(1)/native_build' 23 mkdir '$(1)/native_build'
24 cd '$(1)/native_build' && cmake \ 24 cd '$(1)/native_build' && cmake \
25 $(CMAKE_CCACHE_FLAGS) \ 25 $(CMAKE_CCACHE_FLAGS) \
26 $(CMAKE_BUILD_SHARED_OR_STATIC) \
26 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_NATIVE_TOOLCHAIN_FILE)' \ 27 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_NATIVE_TOOLCHAIN_FILE)' \
27 -DBUILD_TESTING=FALSE \ 28 -DBUILD_TESTING=FALSE \
28 -DOPENGL_INCLUDE_DIR='$(1)/Utilities/ParseOGLExt/headers' \ 29 -DOPENGL_INCLUDE_DIR='$(1)/Utilities/ParseOGLExt/headers' \
29 -DVTK_USE_RENDERING=FALSE \ 30 -DVTK_USE_RENDERING=FALSE \
30 .. 31 ..
38 # now for the cross compilation 39 # now for the cross compilation
39 mkdir '$(1)/cross_build' 40 mkdir '$(1)/cross_build'
40 cd '$(1)/cross_build' && cmake \ 41 cd '$(1)/cross_build' && cmake \
41 -C '$(1)/TryRunResults.cmake'\ 42 -C '$(1)/TryRunResults.cmake'\
42 $(CMAKE_CCACHE_FLAGS) \ 43 $(CMAKE_CCACHE_FLAGS) \
44 $(CMAKE_BUILD_SHARED_OR_STATIC) \
43 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'\ 45 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'\
44 -DBUILD_TESTING=FALSE\ 46 -DBUILD_TESTING=FALSE\
45 -DVTKCompileTools_DIR='$(1)/native_build'\ 47 -DVTKCompileTools_DIR='$(1)/native_build'\
46 -DVTK_USE_SYSTEM_EXPAT=TRUE\ 48 -DVTK_USE_SYSTEM_EXPAT=TRUE\
47 -DVTK_USE_SYSTEM_FREETYPE=TRUE\ 49 -DVTK_USE_SYSTEM_FREETYPE=TRUE\