Mercurial > mxe-octave

comparison Makefile.in @ 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 e50a3ed99da0
children 68a21078c2c5 28e6261e5074
comparison
equal deleted inserted replaced
5570:e50a3ed99da0 5571:b19fb3ed330c
161 161
162 ## The mk-hg-id.sh script will be executed each time Make runs. It will 162 ## The mk-hg-id.sh script will be executed each time Make runs. It will
163 ## update the HG-ID file in the build tree. 163 ## update the HG-ID file in the build tree.
164 $(shell $(TOP_DIR)/tools/mk-hg-id.sh "$(TOP_DIR)") 164 $(shell $(TOP_DIR)/tools/mk-hg-id.sh "$(TOP_DIR)")
165 165
166 # At least one package uses --with instead of --enable. 166 ## At least one package uses --with instead of --enable.
167 ## Some cmake packages use BUILD_STATIC_LIBS and at least
168 ## one uses ONLY_SHARED_LIBS
167 ifeq ($(BUILD_SHARED),yes) 169 ifeq ($(BUILD_SHARED),yes)
168 ifeq ($(BUILD_STATIC),yes) 170 ifeq ($(BUILD_STATIC),yes)
169 ENABLE_SHARED_OR_STATIC := --enable-shared --enable-static 171 ENABLE_SHARED_OR_STATIC := --enable-shared --enable-static
170 WITH_SHARED_OR_STATIC := --with-shared --with-static 172 WITH_SHARED_OR_STATIC := --with-shared --with-static
173 CMAKE_BUILD_SHARED_OR_STATIC := -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DONLY_SHARED_LIBS=OFF
171 else 174 else
172 ENABLE_SHARED_OR_STATIC := --enable-shared --disable-static 175 ENABLE_SHARED_OR_STATIC := --enable-shared --disable-static
173 WITH_SHARED_OR_STATIC := --with-shared --without-static 176 WITH_SHARED_OR_STATIC := --with-shared --without-static
177 CMAKE_BUILD_SHARED_OR_STATIC := -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -DONLY_SHARED_LIBS=ON
174 endif 178 endif
175 else 179 else
176 ENABLE_SHARED_OR_STATIC := --disable-shared --enable-static 180 ENABLE_SHARED_OR_STATIC := --disable-shared --enable-static
177 WITH_SHARED_OR_STATIC := --without-shared --with-static 181 WITH_SHARED_OR_STATIC := --without-shared --with-static
182 CMAKE_BUILD_SHARED_OR_STATIC := -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DONLY_SHARED_LIBS=OFF
178 endif 183 endif
179 184
180 ifeq ($(ENABLE_DEP_DOCS),no) 185 ifeq ($(ENABLE_DEP_DOCS),no)
181 MXE_DISABLE_DOCS := \ 186 MXE_DISABLE_DOCS := \
182 man_MANS= \ 187 man_MANS= \
1090 echo 'set(MSYS 1)'; \ 1095 echo 'set(MSYS 1)'; \
1091 fi; \ 1096 fi; \
1092 if [ $(MXE_SYSTEM) = msvc ]; then \ 1097 if [ $(MXE_SYSTEM) = msvc ]; then \
1093 echo 'set(MSVC 1)'; \ 1098 echo 'set(MSVC 1)'; \
1094 fi; \ 1099 fi; \
1095 if [ $(BUILD_SHARED) = yes ]; then \
1096 echo 'set(BUILD_SHARED_LIBS ON)'; \
1097 else \
1098 echo 'set(BUILD_SHARED_LIBS OFF)'; \
1099 fi; \
1100 if [ $(BUILD_STATIC) = yes ]; then \
1101 echo 'set(BUILD_STATIC_LIBS ON)'; \
1102 else \
1103 echo 'set(BUILD_STATIC_LIBS OFF)'; \
1104 fi; \
1105 echo 'set(CMAKE_BUILD_TYPE Release)'; \ 1100 echo 'set(CMAKE_BUILD_TYPE Release)'; \
1106 if [ $(MXE_SYSTEM) = msvc ]; then \ 1101 if [ $(MXE_SYSTEM) = msvc ]; then \
1107 echo 'set(CMAKE_FIND_ROOT_PATH $(HOST_PREFIX_NATIVE))'; \ 1102 echo 'set(CMAKE_FIND_ROOT_PATH $(HOST_PREFIX_NATIVE))'; \
1108 echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)'; \ 1103 echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)'; \
1109 else \ 1104 else \