/[gentoo-x86]/eclass/cmake-utils.eclass
Gentoo

Diff of /eclass/cmake-utils.eclass

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

Revision 1.82 Revision 1.93
1# Copyright 1999-2012 Gentoo Foundation 1# Copyright 1999-2013 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.82 2012/09/27 16:35:41 axs Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.93 2013/02/08 13:43:19 kensington Exp $
4 4
5# @ECLASS: cmake-utils.eclass 5# @ECLASS: cmake-utils.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# kde@gentoo.org 7# kde@gentoo.org
8# @AUTHOR: 8# @AUTHOR:
26# used for optionality) 26# used for optionality)
27WANT_CMAKE="${WANT_CMAKE:-always}" 27WANT_CMAKE="${WANT_CMAKE:-always}"
28 28
29# @ECLASS-VARIABLE: CMAKE_MIN_VERSION 29# @ECLASS-VARIABLE: CMAKE_MIN_VERSION
30# @DESCRIPTION: 30# @DESCRIPTION:
31# Specify the minimum required CMake version. Default is 2.8.4 31# Specify the minimum required CMake version.
32CMAKE_MIN_VERSION="${CMAKE_MIN_VERSION:-2.8.4}" 32CMAKE_MIN_VERSION="${CMAKE_MIN_VERSION:-2.8.9}"
33 33
34# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES_LIST 34# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES_LIST
35# @DESCRIPTION: 35# @DESCRIPTION:
36# Space-separated list of CMake modules that will be removed in $S during src_prepare, 36# Space-separated list of CMake modules that will be removed in $S during src_prepare,
37# in order to force packages to use the system version. 37# in order to force packages to use the system version.
42# Do we want to remove anything? yes or whatever else for no 42# Do we want to remove anything? yes or whatever else for no
43CMAKE_REMOVE_MODULES="${CMAKE_REMOVE_MODULES:-yes}" 43CMAKE_REMOVE_MODULES="${CMAKE_REMOVE_MODULES:-yes}"
44 44
45# @ECLASS-VARIABLE: CMAKE_MAKEFILE_GENERATOR 45# @ECLASS-VARIABLE: CMAKE_MAKEFILE_GENERATOR
46# @DESCRIPTION: 46# @DESCRIPTION:
47# Specify a makefile generator to be used by cmake. At this point only "make" 47# Specify a makefile generator to be used by cmake.
48# and "ninja" is supported. 48# At this point only "emake" and "ninja" are supported.
49CMAKE_MAKEFILE_GENERATOR="${CMAKE_MAKEFILE_GENERATOR:-make}" 49CMAKE_MAKEFILE_GENERATOR="${CMAKE_MAKEFILE_GENERATOR:-emake}"
50 50
51CMAKEDEPEND="" 51CMAKEDEPEND=""
52case ${WANT_CMAKE} in 52case ${WANT_CMAKE} in
53 always) 53 always)
54 ;; 54 ;;
59esac 59esac
60inherit toolchain-funcs multilib flag-o-matic base 60inherit toolchain-funcs multilib flag-o-matic base
61 61
62CMAKE_EXPF="src_compile src_test src_install" 62CMAKE_EXPF="src_compile src_test src_install"
63case ${EAPI:-0} in 63case ${EAPI:-0} in
64 2|3|4|5) CMAKE_EXPF+=" src_configure" ;; 64 2|3|4|5) CMAKE_EXPF+=" src_prepare src_configure" ;;
65 1|0) ;; 65 1|0) ;;
66 *) die "Unknown EAPI, Bug eclass maintainers." ;; 66 *) die "Unknown EAPI, Bug eclass maintainers." ;;
67esac 67esac
68EXPORT_FUNCTIONS ${CMAKE_EXPF} 68EXPORT_FUNCTIONS ${CMAKE_EXPF}
69
70case ${CMAKE_MAKEFILE_GENERATOR} in
71 emake)
72 CMAKEDEPEND+=" sys-devel/make"
73 ;;
74 ninja)
75 CMAKEDEPEND+=" dev-util/ninja"
76 ;;
77 *)
78 eerror "Unknown value for \${CMAKE_MAKEFILE_GENERATOR}"
79 die "Value ${CMAKE_MAKEFILE_GENERATOR} is not supported"
80 ;;
81esac
69 82
70if [[ ${PN} != cmake ]]; then 83if [[ ${PN} != cmake ]]; then
71 CMAKEDEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}" 84 CMAKEDEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}"
72fi 85fi
73 86
112 echo "-D$1$x=$(use $2 && echo OFF || echo ON) " 125 echo "-D$1$x=$(use $2 && echo OFF || echo ON) "
113 done 126 done
114 fi 127 fi
115} 128}
116 129
117# @ECLASS-VARIABLE: CMAKE_BUILD_DIR 130# @ECLASS-VARIABLE: BUILD_DIR
118# @DESCRIPTION: 131# @DESCRIPTION:
119# Build directory where all cmake processed files should be generated. 132# Build directory where all cmake processed files should be generated.
120# For in-source build it's fixed to ${CMAKE_USE_DIR}. 133# For in-source build it's fixed to ${CMAKE_USE_DIR}.
121# For out-of-source build it can be overriden, by default it uses 134# For out-of-source build it can be overriden, by default it uses
122# ${WORKDIR}/${P}_build. 135# ${WORKDIR}/${P}_build.
136#
137# This variable has been called CMAKE_BUILD_DIR formerly.
138# It is set under that name for compatibility.
123 139
124# @ECLASS-VARIABLE: CMAKE_BUILD_TYPE 140# @ECLASS-VARIABLE: CMAKE_BUILD_TYPE
125# @DESCRIPTION: 141# @DESCRIPTION:
126# Set to override default CMAKE_BUILD_TYPE. Only useful for packages 142# Set to override default CMAKE_BUILD_TYPE. Only useful for packages
127# known to make use of "if (CMAKE_BUILD_TYPE MATCHES xxx)". 143# known to make use of "if (CMAKE_BUILD_TYPE MATCHES xxx)".
161# Determine using IN or OUT source build 177# Determine using IN or OUT source build
162_check_build_dir() { 178_check_build_dir() {
163 : ${CMAKE_USE_DIR:=${S}} 179 : ${CMAKE_USE_DIR:=${S}}
164 if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then 180 if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then
165 # we build in source dir 181 # we build in source dir
166 CMAKE_BUILD_DIR="${CMAKE_USE_DIR}" 182 BUILD_DIR="${CMAKE_USE_DIR}"
167 else 183 else
184 # Respect both the old variable and the new one, depending
185 # on which one was set by the ebuild.
186 if [[ ! ${BUILD_DIR} && ${CMAKE_BUILD_DIR} ]]; then
187 eqawarn "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR."
188 eqawarn "Please migrate the ebuild to use the new one."
189
190 # In the next call, both variables will be set already
191 # and we'd have to know which one takes precedence.
192 _RESPECT_CMAKE_BUILD_DIR=1
193 fi
194
195 if [[ ${_RESPECT_CMAKE_BUILD_DIR} ]]; then
196 BUILD_DIR=${CMAKE_BUILD_DIR:-${WORKDIR}/${P}_build}
197 else
168 : ${CMAKE_BUILD_DIR:=${WORKDIR}/${P}_build} 198 : ${BUILD_DIR:=${WORKDIR}/${P}_build}
169 fi 199 fi
200 fi
201
202 # Backwards compatibility for getting the value.
203 CMAKE_BUILD_DIR=${BUILD_DIR}
204
170 mkdir -p "${CMAKE_BUILD_DIR}" 205 mkdir -p "${BUILD_DIR}"
171 echo ">>> Working in BUILD_DIR: \"$CMAKE_BUILD_DIR\"" 206 echo ">>> Working in BUILD_DIR: \"$BUILD_DIR\""
172} 207}
173 208
174# Determine which generator to use 209# Determine which generator to use
175_generator_to_use() { 210_generator_to_use() {
176 if [[ ${CMAKE_MAKEFILE_GENERATOR} = "ninja" ]]; then 211 local generator_name
177 has_version dev-util/ninja && echo "Ninja" && return 212
178 fi 213 case ${CMAKE_MAKEFILE_GENERATOR} in
179 echo "Unix Makefiles" 214 ninja)
215 generator_name="Ninja"
216 ;;
217 emake)
218 generator_name="Unix Makefiles"
219 ;;
220 *)
221 eerror "Unknown value for \${CMAKE_MAKEFILE_GENERATOR}"
222 die "Value ${CMAKE_MAKEFILE_GENERATOR} is not supported"
223 ;;
224 esac
225
226 echo ${generator_name}
180} 227}
181 228
182# @FUNCTION: cmake-utils_use_with 229# @FUNCTION: cmake-utils_use_with
183# @USAGE: <USE flag> [flag name] 230# @USAGE: <USE flag> [flag name]
184# @DESCRIPTION: 231# @DESCRIPTION:
195# 242#
196# `cmake-utils_use_enable foo FOO` echoes -DENABLE_FOO=ON if foo is enabled 243# `cmake-utils_use_enable foo FOO` echoes -DENABLE_FOO=ON if foo is enabled
197# and -DENABLE_FOO=OFF if it is disabled. 244# and -DENABLE_FOO=OFF if it is disabled.
198cmake-utils_use_enable() { _use_me_now ENABLE_ "$@" ; } 245cmake-utils_use_enable() { _use_me_now ENABLE_ "$@" ; }
199 246
247# @FUNCTION: cmake-utils_use_find_package
248# @USAGE: <USE flag> [flag name]
249# @DESCRIPTION:
250# Based on use_enable. See ebuild(5).
251#
252# `cmake-utils_use_find_package foo FOO` echoes -DCMAKE_DISABLE_FIND_PACKAGE=OFF
253# if foo is enabled and -DCMAKE_DISABLE_FIND_PACKAGE=ON if it is disabled.
254# This can be used to make find_package optional (since cmake-2.8.6).
255cmake-utils_use_find_package() { _use_me_now_inverted CMAKE_DISABLE_FIND_PACKAGE_ "$@" ; }
256
200# @FUNCTION: cmake-utils_use_disable 257# @FUNCTION: cmake-utils_use_disable
201# @USAGE: <USE flag> [flag name] 258# @USAGE: <USE flag> [flag name]
202# @DESCRIPTION: 259# @DESCRIPTION:
203# Based on inversion of use_enable. See ebuild(5). 260# Based on inversion of use_enable. See ebuild(5).
204# 261#
264# Removes dangerous definitions that override Gentoo settings. 321# Removes dangerous definitions that override Gentoo settings.
265_modify-cmakelists() { 322_modify-cmakelists() {
266 debug-print-function ${FUNCNAME} "$@" 323 debug-print-function ${FUNCNAME} "$@"
267 324
268 # Only edit the files once 325 # Only edit the files once
269 grep -qs "<<< Gentoo configuration >>>" CMakeLists.txt && return 0 326 grep -qs "<<< Gentoo configuration >>>" "${CMAKE_USE_DIR}"/CMakeLists.txt && return 0
270 327
271 # Comment out all set (<some_should_be_user_defined_variable> value) 328 # Comment out all set (<some_should_be_user_defined_variable> value)
272 # TODO Add QA checker - inform when variable being checked for below is set in CMakeLists.txt 329 # TODO Add QA checker - inform when variable being checked for below is set in CMakeLists.txt
273 find "${CMAKE_USE_DIR}" -name CMakeLists.txt \ 330 find "${CMAKE_USE_DIR}" -name CMakeLists.txt \
274 -exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE.*)/{s/^/#IGNORE /g}' {} + \ 331 -exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE.*)/{s/^/#IGNORE /g}' {} + \
291 Module \${CMAKE_MODULE_LINKER_FLAGS} 348 Module \${CMAKE_MODULE_LINKER_FLAGS}
292 Shared \${CMAKE_SHARED_LINKER_FLAGS}\n") 349 Shared \${CMAKE_SHARED_LINKER_FLAGS}\n")
293 _EOF_ 350 _EOF_
294} 351}
295 352
353enable_cmake-utils_src_prepare() {
354 debug-print-function ${FUNCNAME} "$@"
355
356 base_src_prepare
357}
358
296enable_cmake-utils_src_configure() { 359enable_cmake-utils_src_configure() {
297 debug-print-function ${FUNCNAME} "$@" 360 debug-print-function ${FUNCNAME} "$@"
298 361
299 [[ "${CMAKE_REMOVE_MODULES}" == "yes" ]] && { 362 [[ "${CMAKE_REMOVE_MODULES}" == "yes" ]] && {
300 local name 363 local name
325 if ! has debug ${IUSE//+} || ! use debug; then 388 if ! has debug ${IUSE//+} || ! use debug; then
326 append-cppflags -DNDEBUG 389 append-cppflags -DNDEBUG
327 fi 390 fi
328 fi 391 fi
329 392
330 # Prepare Gentoo override rules (set valid compiler, append CPPFLAGS) 393 # Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.)
331 local build_rules=${CMAKE_BUILD_DIR}/gentoo_rules.cmake 394 local build_rules=${BUILD_DIR}/gentoo_rules.cmake
332 cat > "${build_rules}" <<- _EOF_ 395 cat > "${build_rules}" <<- _EOF_
396 SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE)
397 SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
333 SET (CMAKE_C_COMPILER $(type -P $(tc-getCC)) CACHE FILEPATH "C compiler" FORCE) 398 SET (CMAKE_C_COMPILER $(type -P $(tc-getCC)) CACHE FILEPATH "C compiler" FORCE)
334 SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE) 399 SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
335 SET (CMAKE_CXX_COMPILER $(type -P $(tc-getCXX)) CACHE FILEPATH "C++ compiler" FORCE) 400 SET (CMAKE_CXX_COMPILER $(type -P $(tc-getCXX)) CACHE FILEPATH "C++ compiler" FORCE)
336 SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE) 401 SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
402 SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE)
337 _EOF_ 403 _EOF_
338 404
339 has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= 405 has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
340 406
341 if [[ ${EPREFIX} ]]; then 407 if [[ ${EPREFIX} ]]; then
360 ENDIF (NOT APPLE) 426 ENDIF (NOT APPLE)
361 _EOF_ 427 _EOF_
362 fi 428 fi
363 429
364 # Common configure parameters (invariants) 430 # Common configure parameters (invariants)
365 local common_config=${CMAKE_BUILD_DIR}/gentoo_common_config.cmake 431 local common_config=${BUILD_DIR}/gentoo_common_config.cmake
366 local libdir=$(get_libdir) 432 local libdir=$(get_libdir)
367 cat > "${common_config}" <<- _EOF_ 433 cat > "${common_config}" <<- _EOF_
368 SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE) 434 SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
369 SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries") 435 SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
370 _EOF_ 436 _EOF_
392 -DCMAKE_INSTALL_DO_STRIP=OFF 458 -DCMAKE_INSTALL_DO_STRIP=OFF
393 -DCMAKE_USER_MAKE_RULES_OVERRIDE="${build_rules}" 459 -DCMAKE_USER_MAKE_RULES_OVERRIDE="${build_rules}"
394 "${MYCMAKEARGS}" 460 "${MYCMAKEARGS}"
395 ) 461 )
396 462
397 pushd "${CMAKE_BUILD_DIR}" > /dev/null 463 pushd "${BUILD_DIR}" > /dev/null
398 debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: mycmakeargs is ${mycmakeargs_local[*]}" 464 debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: mycmakeargs is ${mycmakeargs_local[*]}"
399 echo "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}" 465 echo "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}"
400 "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}" || die "cmake failed" 466 "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}" || die "cmake failed"
401 popd > /dev/null 467 popd > /dev/null
402} 468}
406 472
407 has src_configure ${CMAKE_EXPF} || cmake-utils_src_configure 473 has src_configure ${CMAKE_EXPF} || cmake-utils_src_configure
408 cmake-utils_src_make "$@" 474 cmake-utils_src_make "$@"
409} 475}
410 476
477# @FUNCTION: ninja_src_make
478# @INTERNAL
479# @DESCRIPTION:
480# Build the package using ninja generator
481ninja_src_make() {
482 debug-print-function ${FUNCNAME} "$@"
483
484 [[ -e build.ninja ]] || die "Makefile not found. Error during configure stage."
485
486 if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then
487 # TODO: get load average from portage (-l option)
488 ninja ${MAKEOPTS} -v "$@" || die
489 else
490 ninja "$@" || die
491 fi
492}
493
494# @FUNCTION: make_src_make
495# @INTERNAL
496# @DESCRIPTION:
497# Build the package using make generator
498emake_src_make() {
499 debug-print-function ${FUNCNAME} "$@"
500
501 [[ -e Makefile ]] || die "Makefile not found. Error during configure stage."
502
503 if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then
504 emake VERBOSE=1 "$@" || die
505 else
506 emake "$@" || die
507 fi
508
509}
510
411# @FUNCTION: cmake-utils_src_make 511# @FUNCTION: cmake-utils_src_make
412# @DESCRIPTION: 512# @DESCRIPTION:
413# Function for building the package. Automatically detects the build type. 513# Function for building the package. Automatically detects the build type.
414# All arguments are passed to emake. 514# All arguments are passed to emake.
415cmake-utils_src_make() { 515cmake-utils_src_make() {
416 debug-print-function ${FUNCNAME} "$@" 516 debug-print-function ${FUNCNAME} "$@"
417 517
418 _check_build_dir 518 _check_build_dir
419 pushd "${CMAKE_BUILD_DIR}" > /dev/null 519 pushd "${BUILD_DIR}" > /dev/null
420 if [[ $(_generator_to_use) = Ninja ]]; then 520
421 # first check if Makefile exist otherwise die 521 ${CMAKE_MAKEFILE_GENERATOR}_src_make $@
422 [[ -e build.ninja ]] || die "Makefile not found. Error during configure stage." 522
423 if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then
424 #TODO get load average from portage (-l option)
425 ninja ${MAKEOPTS} -v "$@"
426 else
427 ninja "$@"
428 fi || die "ninja failed!"
429 else
430 # first check if Makefile exist otherwise die
431 [[ -e Makefile ]] || die "Makefile not found. Error during configure stage."
432 if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then
433 emake VERBOSE=1 "$@" || die "Make failed!"
434 else
435 emake "$@" || die "Make failed!"
436 fi
437 fi
438 popd > /dev/null 523 popd > /dev/null
439} 524}
440 525
441enable_cmake-utils_src_install() { 526enable_cmake-utils_src_install() {
442 debug-print-function ${FUNCNAME} "$@" 527 debug-print-function ${FUNCNAME} "$@"
443 528
444 _check_build_dir 529 _check_build_dir
445 pushd "${CMAKE_BUILD_DIR}" > /dev/null 530 pushd "${BUILD_DIR}" > /dev/null
446 if [[ $(_generator_to_use) = Ninja ]]; then 531
447 DESTDIR=${D} ninja install "$@" || die "died running ninja install" 532 DESTDIR="${D}" ${CMAKE_MAKEFILE_GENERATOR} install "$@" || die "died running ${CMAKE_MAKEFILE_GENERATOR} install"
448 base_src_install_docs 533 base_src_install_docs
449 else 534
450 base_src_install "$@"
451 fi
452 popd > /dev/null 535 popd > /dev/null
453 536
454 # Backward compatibility, for non-array variables 537 # Backward compatibility, for non-array variables
455 if [[ -n "${DOCS}" ]] && [[ "$(declare -p DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then 538 if [[ -n "${DOCS}" ]] && [[ "$(declare -p DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then
456 dodoc ${DOCS} || die "dodoc failed" 539 dodoc ${DOCS} || die "dodoc failed"
460 fi 543 fi
461} 544}
462 545
463enable_cmake-utils_src_test() { 546enable_cmake-utils_src_test() {
464 debug-print-function ${FUNCNAME} "$@" 547 debug-print-function ${FUNCNAME} "$@"
465 local ctestargs
466 548
467 _check_build_dir 549 _check_build_dir
468 pushd "${CMAKE_BUILD_DIR}" > /dev/null 550 pushd "${BUILD_DIR}" > /dev/null
469 [[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; } 551 [[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; }
470 552
471 [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" 553 [[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
472 554
473 if ctest ${ctestargs} "$@" ; then 555 if ctest "${myctestargs[@]}" "$@" ; then
474 einfo "Tests succeeded." 556 einfo "Tests succeeded."
557 popd > /dev/null
558 return 0
475 else 559 else
476 if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then 560 if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then
477 # on request from Diego 561 # on request from Diego
478 eerror "Tests failed. Test log ${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log follows:" 562 eerror "Tests failed. Test log ${BUILD_DIR}/Testing/Temporary/LastTest.log follows:"
479 eerror "--START TEST LOG--------------------------------------------------------------" 563 eerror "--START TEST LOG--------------------------------------------------------------"
480 cat "${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log" 564 cat "${BUILD_DIR}/Testing/Temporary/LastTest.log"
481 eerror "--END TEST LOG----------------------------------------------------------------" 565 eerror "--END TEST LOG----------------------------------------------------------------"
482 die "Tests failed." 566 die "Tests failed."
483 else 567 else
484 die "Tests failed. When you file a bug, please attach the following file: \n\t${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log" 568 die "Tests failed. When you file a bug, please attach the following file: \n\t${BUILD_DIR}/Testing/Temporary/LastTest.log"
485 fi 569 fi
486 fi 570
571 # die might not die due to nonfatal
487 popd > /dev/null 572 popd > /dev/null
573 return 1
574 fi
575}
576
577# @FUNCTION: cmake-utils_src_prepare
578# @DESCRIPTION:
579# Wrapper function around base_src_prepare, just to expand the eclass API.
580cmake-utils_src_prepare() {
581 _execute_optionaly "src_prepare" "$@"
488} 582}
489 583
490# @FUNCTION: cmake-utils_src_configure 584# @FUNCTION: cmake-utils_src_configure
491# @DESCRIPTION: 585# @DESCRIPTION:
492# General function for configuring with cmake. Default behaviour is to start an 586# General function for configuring with cmake. Default behaviour is to start an

Legend:
Removed from v.1.82  
changed lines
  Added in v.1.93

  ViewVC Help
Powered by ViewVC 1.1.20