Magellan Linux

Diff of /trunk/include/cmake.sminc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 29889 by niro, Tue Oct 17 13:53:59 2017 UTC revision 33261 by niro, Tue Oct 22 12:29:35 2019 UTC
# Line 131  cmake_configure() Line 131  cmake_configure()
131  {  {
132   local configure_opts="$@"   local configure_opts="$@"
133   local default_opts   local default_opts
134     [[ -n ${CMAKE_SRCDIR} ]] || local CMAKE_SRCDIR
135     [[ -n ${CMAKE_BUILDDIR} ]] || local CMAKE_BUILDDIR
136    
137   # disable colors if requested   # disable colors if requested
138   if [[ ${NOCOLORS} = true ]]   if [[ ${NOCOLORS} = true ]]
# Line 141  cmake_configure() Line 143  cmake_configure()
143   default_opts+=" -DCMAKE_VERBOSE_MAKEFILE=ON"   default_opts+=" -DCMAKE_VERBOSE_MAKEFILE=ON"
144   default_opts+=" -DCMAKE_BUILD_TYPE=Release"   default_opts+=" -DCMAKE_BUILD_TYPE=Release"
145   default_opts+=" -DCMAKE_INSTALL_PREFIX=${PREFIX:-/usr}"   default_opts+=" -DCMAKE_INSTALL_PREFIX=${PREFIX:-/usr}"
146   default_opts+=' -DLIB_SUFFIX=$(cmake_libsuffix)'   if [[ ${MULTILIB_BUILD} = true ]]
147   default_opts+=' -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)'   then
148     # eval these variables later with the abi-${ABI} caller
149     default_opts+=' -DLIB_SUFFIX=$(cmake_libsuffix)'
150     default_opts+=' -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)'
151     default_opts+=' -DLIB_SUFFIX=$(cmake_libsuffix)'
152     else
153     # eval these variables now
154     default_opts+=" -DLIB_SUFFIX=$(cmake_libsuffix)"
155     default_opts+=" -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)"
156     default_opts+=" -DLIB_SUFFIX=$(cmake_libsuffix)"
157     fi
158    
159   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
160   then   then
# Line 153  cmake_configure() Line 165  cmake_configure()
165   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
166   for abi in ${abis_to_run}   for abi in ${abis_to_run}
167   do   do
168   cd ${BUILDDIR}/build-${abi}   : ${CMAKE_SRCDIR="${SRCDIR}-${abi}/${SRCSUBDIR}"}
169   abi-${abi} cmake ${default_opts} ${configure_opts} ${SRCDIR}-${abi}/${SRCSUBDIR} || die   : ${CMAKE_BUILDDIR="${BUILDDIR}/build-${abi}"}
170     cd ${CMAKE_BUILDDIR}
171     abi-${abi} cmake ${default_opts} ${configure_opts} ${CMAKE_SRCDIR} || die
172   done   done
173   else   else
174     : ${CMAKE_SRCDIR="${SRCDIR}/${SRCSUBDIR}"}
175     : ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
176   cd ${BUILDDIR}/build   cd ${BUILDDIR}/build
177   cmake ${default_opts} ${configure_opts} ${SRCDIR}/${SRCSUBDIR} || die   cmake ${default_opts} ${configure_opts} ${SRCDIR}/${SRCSUBDIR} || die
178   fi   fi
# Line 164  cmake_configure() Line 180  cmake_configure()
180    
181  cmake_setup_builddir()  cmake_setup_builddir()
182  {  {
183     [[ -n ${CMAKE_BUILDDIR} ]] || local CMAKE_BUILDDIR
184    
185     if [[ ${MULTILIB_BUILD} = true ]]
186     then
187     : ${CMAKE_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
188     all-abis install -d ${CMAKE_BUILDDIR} || die
189     else
190     : ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
191     install -d ${CMAKE_BUILDDIR} || die
192     fi
193    }
194    
195    cmake_mmake()
196    {
197     [[ -n ${CMAKE_BUILDDIR} ]] || local CMAKE_BUILDDIR
198    
199   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
200   then   then
201   all-abis install -d ${BUILDDIR}/build-$(mabi) || die   : ${CMAKE_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
202     mmake -C ${CMAKE_BUILDDIR} "$@" || die
203   else   else
204   install -d ${BUILDDIR}/build || die   : ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
205     mmake -C ${CMAKE_BUILDDIR} "$@" || die
206   fi   fi
207  }  }
208    
209  cmake_src_compile()  cmake_src_compile()
210  {  {
211   cd ${SRCDIR}   [[ -n ${CMAKE_SRCDIR} ]] || local CMAKE_SRCDIR
212    
213     : ${CMAKE_SRCDIR="${SRCDIR}"}
214     cd ${CMAKE_SRCDIR}
215    
216   cmake_setup_builddir || die   cmake_setup_builddir || die
217   cmake_configure || die   cmake_configure "$@" || die
218   mmake || die   cmake_mmake || die
219  }  }
220    
221  cmake_src_check()  cmake_src_check()
222  {  {
223   #cd ${BUILDDIR}/build   #[[ -n ${CMAKE_BUILDDIR} ]] || local CMAKE_BUILDDIR
224     #
225     #: ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
226     #cd ${CMAKE_BUILDDIR}
227   #mmake -j1 -k check || die   #mmake -j1 -k check || die
228   return 0   return 0
229  }  }
230    
231  cmake_multilib_src_check()  cmake_multilib_src_check()
232  {  {
233     #[[ -n ${CMAKE_BUILDDIR} ]] || local CMAKE_BUILDDIR
234     #
235   #local abi   #local abi
236   #local abis_to_run="${MULTILIB_ABIS}"   #local abis_to_run="${MULTILIB_ABIS}"
237   #   #
# Line 197  cmake_multilib_src_check() Line 239  cmake_multilib_src_check()
239   #[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   #[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
240   #for abi in ${abis_to_run}   #for abi in ${abis_to_run}
241   #do   #do
242   # cd ${BUILDDIR}/build-${abi}   # : ${CMAKE_BUILDDIR="${BUILDDIR}/build-${abi}"}
243     # cd ${CMAKE_BUILDDIR}
244   # mmake -j1 -k check || die   # mmake -j1 -k check || die
245   #done   #done
246   return 0   return 0
# Line 205  cmake_multilib_src_check() Line 248  cmake_multilib_src_check()
248    
249  cmake_src_install()  cmake_src_install()
250  {  {
251   cd ${BUILDDIR}/build   [[ -n ${CMAKE_SRCDIR} ]] || local CMAKE_SRCDIR
252   make ${MAKEOPTS} DESTDIR=${BINDIR} install || die  
253     : ${CMAKE_SRCDIR="${SRCDIR}"}
254    
255     cmake_mmake DESTDIR=${BINDIR} install || die
256    
257   cd ${SRCDIR}   cd ${CMAKE_SRCDIR}
258   local i   local i
259   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
260   FAQ LICENSE NEWS README TODO   FAQ LICENSE NEWS README TODO
261   do   do
262   if [ -f ${SRCDIR}/${i} ]   if [ -f ${CMAKE_SRCDIR}/${i} ]
263   then   then
264   minstalldocs ${i} || die   minstalldocs ${i} || die
265   fi   fi
# Line 224  cmake_multilib_src_install() Line 270  cmake_multilib_src_install()
270  {  {
271   local abi   local abi
272   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
273     [[ -n ${CMAKE_SRCDIR} ]] || local CMAKE_SRCDIR
274    
275     cmake_mmake DESTDIR=${BINDIR} install || die
276    
277   # respect MULTILIB_ONLY_ABI variable   # respect MULTILIB_ONLY_ABI variable
278   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
279   for abi in ${abis_to_run}   for abi in ${abis_to_run}
280   do   do
281   cd ${BUILDDIR}/build-${abi}   : ${CMAKE_SRCDIR="${SRCDIR}-${abi}"}
  make ${MAKEOPTS} DESTDIR=${BINDIR} install || die  
282    
283   cd ${SRCDIR}-${abi}   cd ${CMAKE_SRCDIR}
284   local i   local i
285   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
286   FAQ LICENSE NEWS README TODO   FAQ LICENSE NEWS README TODO
287   do   do
288   if [ -f ${SRCDIR}-${abi}/${i} ]   if [ -f ${CMAKE_SRCDIR}/${i} ]
289   then   then
290   minstalldocs ${i} || die   minstalldocs ${i} || die
291   fi   fi

Legend:
Removed from v.29889  
changed lines
  Added in v.33261