Magellan Linux

Diff of /smage/branches/alx07x-stable/include/cmake.sminc

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

revision 11527 by niro, Thu Dec 21 09:38:04 2017 UTC revision 15338 by niro, Wed Aug 19 12:46:15 2020 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 163  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 174  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 ]]   if [[ ${MULTILIB_BUILD} = true ]]
186   then   then
187   all-abis install -d ${BUILDDIR}/build-$(mabi) || die   : ${CMAKE_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
188     all-abis install -d ${CMAKE_BUILDDIR} || die
189   else   else
190   install -d ${BUILDDIR}/build || die   : ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
191     install -d ${CMAKE_BUILDDIR} || die
192   fi   fi
193  }  }
194    
195  cmake_mmake()  cmake_mmake()
196  {  {
197     [[ -n ${CMAKE_BUILDDIR} ]] || local CMAKE_BUILDDIR
198    
199   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
200   then   then
201   mmake -C ${BUILDDIR}/build-$(mabi) "$@" || die   : ${CMAKE_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
202     mmake -C ${CMAKE_BUILDDIR} "$@" || die
203   else   else
204   mmake -C ${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     if [[ ${MULTILIB_BUILD} = true ]]
214     then
215     : ${CMAKE_SRCDIR="${SRCDIR}-$(mabi)/${SRCSUBDIR}"}
216     else
217     : ${CMAKE_SRCDIR="${SRCDIR}"}
218     fi
219     cd ${CMAKE_SRCDIR}
220    
221   cmake_setup_builddir || die   cmake_setup_builddir || die
222   cmake_configure "$@" || die   cmake_configure "$@" || die
# Line 203  cmake_src_compile() Line 225  cmake_src_compile()
225    
226  cmake_src_check()  cmake_src_check()
227  {  {
228   #cd ${BUILDDIR}/build   #[[ -n ${CMAKE_BUILDDIR} ]] || local CMAKE_BUILDDIR
229     #
230     #: ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
231     #cd ${CMAKE_BUILDDIR}
232   #mmake -j1 -k check || die   #mmake -j1 -k check || die
233   return 0   return 0
234  }  }
235    
236  cmake_multilib_src_check()  cmake_multilib_src_check()
237  {  {
238     #[[ -n ${CMAKE_BUILDDIR} ]] || local CMAKE_BUILDDIR
239     #
240   #local abi   #local abi
241   #local abis_to_run="${MULTILIB_ABIS}"   #local abis_to_run="${MULTILIB_ABIS}"
242   #   #
# Line 217  cmake_multilib_src_check() Line 244  cmake_multilib_src_check()
244   #[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   #[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
245   #for abi in ${abis_to_run}   #for abi in ${abis_to_run}
246   #do   #do
247   # cd ${BUILDDIR}/build-${abi}   # : ${CMAKE_BUILDDIR="${BUILDDIR}/build-${abi}"}
248     # cd ${CMAKE_BUILDDIR}
249   # mmake -j1 -k check || die   # mmake -j1 -k check || die
250   #done   #done
251   return 0   return 0
# Line 225  cmake_multilib_src_check() Line 253  cmake_multilib_src_check()
253    
254  cmake_src_install()  cmake_src_install()
255  {  {
256     [[ -n ${CMAKE_SRCDIR} ]] || local CMAKE_SRCDIR
257    
258     : ${CMAKE_SRCDIR="${SRCDIR}"}
259    
260   cmake_mmake DESTDIR=${BINDIR} install || die   cmake_mmake DESTDIR=${BINDIR} install || die
261    
262   cd ${SRCDIR}   cd ${CMAKE_SRCDIR}
263   local i   local i
264   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
265   FAQ LICENSE NEWS README TODO   FAQ LICENSE NEWS README TODO
266   do   do
267   if [ -f ${SRCDIR}/${i} ]   if [ -f ${CMAKE_SRCDIR}/${i} ]
268   then   then
269   minstalldocs ${i} || die   minstalldocs ${i} || die
270   fi   fi
# Line 243  cmake_multilib_src_install() Line 275  cmake_multilib_src_install()
275  {  {
276   local abi   local abi
277   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
278     [[ -n ${CMAKE_SRCDIR} ]] || local CMAKE_SRCDIR
279    
280   cmake_mmake DESTDIR=${BINDIR} install || die   cmake_mmake DESTDIR=${BINDIR} install || die
281    
# Line 250  cmake_multilib_src_install() Line 283  cmake_multilib_src_install()
283   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
284   for abi in ${abis_to_run}   for abi in ${abis_to_run}
285   do   do
286   cd ${SRCDIR}-${abi}   : ${CMAKE_SRCDIR="${SRCDIR}-${abi}"}
287    
288     cd ${CMAKE_SRCDIR}
289   local i   local i
290   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
291   FAQ LICENSE NEWS README TODO   FAQ LICENSE NEWS README TODO
292   do   do
293   if [ -f ${SRCDIR}-${abi}/${i} ]   if [ -f ${CMAKE_SRCDIR}/${i} ]
294   then   then
295   minstalldocs ${i} || die   minstalldocs ${i} || die
296   fi   fi

Legend:
Removed from v.11527  
changed lines
  Added in v.15338