/[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.78 Revision 1.87
1# Copyright 1999-2012 Gentoo Foundation 1# Copyright 1999-2012 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.78 2012/04/16 10:28:47 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.87 2012/12/03 09:29:09 mgorny 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:
39 39
40# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES 40# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES
41# @DESCRIPTION: 41# @DESCRIPTION:
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
45# @ECLASS-VARIABLE: CMAKE_MAKEFILE_GENERATOR
46# @DESCRIPTION:
47# Specify a makefile generator to be used by cmake. At this point only "make"
48# and "ninja" is supported.
49CMAKE_MAKEFILE_GENERATOR="${CMAKE_MAKEFILE_GENERATOR:-make}"
44 50
45CMAKEDEPEND="" 51CMAKEDEPEND=""
46case ${WANT_CMAKE} in 52case ${WANT_CMAKE} in
47 always) 53 always)
48 ;; 54 ;;
53esac 59esac
54inherit toolchain-funcs multilib flag-o-matic base 60inherit toolchain-funcs multilib flag-o-matic base
55 61
56CMAKE_EXPF="src_compile src_test src_install" 62CMAKE_EXPF="src_compile src_test src_install"
57case ${EAPI:-0} in 63case ${EAPI:-0} in
58 4|3|2) CMAKE_EXPF+=" src_configure" ;; 64 2|3|4|5) CMAKE_EXPF+=" src_configure" ;;
59 1|0) ;; 65 1|0) ;;
60 *) die "Unknown EAPI, Bug eclass maintainers." ;; 66 *) die "Unknown EAPI, Bug eclass maintainers." ;;
61esac 67esac
62EXPORT_FUNCTIONS ${CMAKE_EXPF} 68EXPORT_FUNCTIONS ${CMAKE_EXPF}
63
64: ${DESCRIPTION:="Based on the ${ECLASS} eclass"}
65 69
66if [[ ${PN} != cmake ]]; then 70if [[ ${PN} != cmake ]]; then
67 CMAKEDEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}" 71 CMAKEDEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}"
68fi 72fi
69 73
108 echo "-D$1$x=$(use $2 && echo OFF || echo ON) " 112 echo "-D$1$x=$(use $2 && echo OFF || echo ON) "
109 done 113 done
110 fi 114 fi
111} 115}
112 116
113# @ECLASS-VARIABLE: CMAKE_BUILD_DIR 117# @ECLASS-VARIABLE: BUILD_DIR
114# @DESCRIPTION: 118# @DESCRIPTION:
115# Build directory where all cmake processed files should be generated. 119# Build directory where all cmake processed files should be generated.
116# For in-source build it's fixed to ${CMAKE_USE_DIR}. 120# For in-source build it's fixed to ${CMAKE_USE_DIR}.
117# For out-of-source build it can be overriden, by default it uses 121# For out-of-source build it can be overriden, by default it uses
118# ${WORKDIR}/${P}_build. 122# ${WORKDIR}/${P}_build.
123#
124# This variable has been called CMAKE_BUILD_DIR formerly.
125# It is set under that name for compatibility.
119 126
120# @ECLASS-VARIABLE: CMAKE_BUILD_TYPE 127# @ECLASS-VARIABLE: CMAKE_BUILD_TYPE
121# @DESCRIPTION: 128# @DESCRIPTION:
122# Set to override default CMAKE_BUILD_TYPE. Only useful for packages 129# Set to override default CMAKE_BUILD_TYPE. Only useful for packages
123# known to make use of "if (CMAKE_BUILD_TYPE MATCHES xxx)". 130# known to make use of "if (CMAKE_BUILD_TYPE MATCHES xxx)".
137# plugin needs to be done by cmake. 144# plugin needs to be done by cmake.
138# By default it uses ${S}. 145# By default it uses ${S}.
139 146
140# @ECLASS-VARIABLE: CMAKE_VERBOSE 147# @ECLASS-VARIABLE: CMAKE_VERBOSE
141# @DESCRIPTION: 148# @DESCRIPTION:
142# Set to enable verbose messages during compilation. 149# Set to OFF to disable verbose messages during compilation
150: ${CMAKE_VERBOSE:=ON}
143 151
144# @ECLASS-VARIABLE: PREFIX 152# @ECLASS-VARIABLE: PREFIX
145# @DESCRIPTION: 153# @DESCRIPTION:
146# Eclass respects PREFIX variable, though it's not recommended way to set 154# Eclass respects PREFIX variable, though it's not recommended way to set
147# install/lib/bin prefixes. 155# install/lib/bin prefixes.
148# Use -DCMAKE_INSTALL_PREFIX=... CMake variable instead. 156# Use -DCMAKE_INSTALL_PREFIX=... CMake variable instead.
157: ${PREFIX:=/usr}
149 158
150# @ECLASS-VARIABLE: CMAKE_BINARY 159# @ECLASS-VARIABLE: CMAKE_BINARY
151# @DESCRIPTION: 160# @DESCRIPTION:
152# Eclass can use different cmake binary than the one provided in by system. 161# Eclass can use different cmake binary than the one provided in by system.
153: ${CMAKE_BINARY:=cmake} 162: ${CMAKE_BINARY:=cmake}
155# Determine using IN or OUT source build 164# Determine using IN or OUT source build
156_check_build_dir() { 165_check_build_dir() {
157 : ${CMAKE_USE_DIR:=${S}} 166 : ${CMAKE_USE_DIR:=${S}}
158 if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then 167 if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then
159 # we build in source dir 168 # we build in source dir
160 CMAKE_BUILD_DIR="${CMAKE_USE_DIR}" 169 BUILD_DIR="${CMAKE_USE_DIR}"
161 else 170 else
171 # Respect both the old variable and the new one, depending
172 # on which one was set by the ebuild.
173 if [[ ! ${BUILD_DIR} && ${AUTOTOOLS_BUILD_DIR} ]]; then
174 eqawarn "The AUTOTOOLS_BUILD_DIR variable has been renamed to BUILD_DIR."
175 eqawarn "Please migrate the ebuild to use the new one."
176
177 # In the next call, both variables will be set already
178 # and we'd have to know which one takes precedence.
179 _RESPECT_AUTOTOOLS_BUILD_DIR=1
180 fi
181 if [[ ${_RESPECT_AUTOTOOLS_BUILD_DIR} ]]; then
182 BUILD_DIR=${AUTOTOOLS_BUILD_DIR}
183 fi
184
162 : ${CMAKE_BUILD_DIR:=${WORKDIR}/${P}_build} 185 : ${BUILD_DIR:=${WORKDIR}/${P}_build}
163 fi 186 fi
187
188 # Backwards compatibility for getting the value.
189 CMAKE_BUILD_DIR=${BUILD_DIR}
190
164 mkdir -p "${CMAKE_BUILD_DIR}" 191 mkdir -p "${BUILD_DIR}"
165 echo ">>> Working in BUILD_DIR: \"$CMAKE_BUILD_DIR\"" 192 echo ">>> Working in BUILD_DIR: \"$BUILD_DIR\""
166} 193}
194
195# Determine which generator to use
196_generator_to_use() {
197 if [[ ${CMAKE_MAKEFILE_GENERATOR} = "ninja" ]]; then
198 has_version dev-util/ninja && echo "Ninja" && return
199 fi
200 echo "Unix Makefiles"
201}
202
167# @FUNCTION: cmake-utils_use_with 203# @FUNCTION: cmake-utils_use_with
168# @USAGE: <USE flag> [flag name] 204# @USAGE: <USE flag> [flag name]
169# @DESCRIPTION: 205# @DESCRIPTION:
170# Based on use_with. See ebuild(5). 206# Based on use_with. See ebuild(5).
171# 207#
249# Removes dangerous definitions that override Gentoo settings. 285# Removes dangerous definitions that override Gentoo settings.
250_modify-cmakelists() { 286_modify-cmakelists() {
251 debug-print-function ${FUNCNAME} "$@" 287 debug-print-function ${FUNCNAME} "$@"
252 288
253 # Only edit the files once 289 # Only edit the files once
254 grep -qs "<<< Gentoo configuration >>>" CMakeLists.txt && return 0 290 grep -qs "<<< Gentoo configuration >>>" "${CMAKE_USE_DIR}"/CMakeLists.txt && return 0
255 291
256 # Comment out all set (<some_should_be_user_defined_variable> value) 292 # Comment out all set (<some_should_be_user_defined_variable> value)
257 # TODO Add QA checker - inform when variable being checked for below is set in CMakeLists.txt 293 # TODO Add QA checker - inform when variable being checked for below is set in CMakeLists.txt
258 find "${CMAKE_USE_DIR}" -name CMakeLists.txt \ 294 find "${CMAKE_USE_DIR}" -name CMakeLists.txt \
259 -exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE.*)/{s/^/#IGNORE /g}' {} + \ 295 -exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE.*)/{s/^/#IGNORE /g}' {} + \
310 if ! has debug ${IUSE//+} || ! use debug; then 346 if ! has debug ${IUSE//+} || ! use debug; then
311 append-cppflags -DNDEBUG 347 append-cppflags -DNDEBUG
312 fi 348 fi
313 fi 349 fi
314 350
315 # Prepare Gentoo override rules (set valid compiler, append CPPFLAGS) 351 # Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.)
316 local build_rules=${CMAKE_BUILD_DIR}/gentoo_rules.cmake 352 local build_rules=${BUILD_DIR}/gentoo_rules.cmake
317 cat > "${build_rules}" <<- _EOF_ 353 cat > "${build_rules}" <<- _EOF_
354 SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE)
318 SET (CMAKE_C_COMPILER $(type -P $(tc-getCC)) CACHE FILEPATH "C compiler" FORCE) 355 SET (CMAKE_C_COMPILER $(type -P $(tc-getCC)) CACHE FILEPATH "C compiler" FORCE)
319 SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE) 356 SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
320 SET (CMAKE_CXX_COMPILER $(type -P $(tc-getCXX)) CACHE FILEPATH "C++ compiler" FORCE) 357 SET (CMAKE_CXX_COMPILER $(type -P $(tc-getCXX)) CACHE FILEPATH "C++ compiler" FORCE)
321 SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE) 358 SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
359 SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE)
322 _EOF_ 360 _EOF_
323 361
324 has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= 362 has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
325 363
326 if [[ ${EPREFIX} ]]; then 364 if [[ ${EPREFIX} ]]; then
332 SET (CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH "${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" 370 SET (CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH "${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)"
333 CACHE STRING "" FORCE) 371 CACHE STRING "" FORCE)
334 372
335 ELSE () 373 ELSE ()
336 374
337 SET(CMAKE_PREFIX_PATH "${EPREFIX}${PREFIX:-/usr}" CACHE STRING ""FORCE) 375 SET(CMAKE_PREFIX_PATH "${EPREFIX}${PREFIX}" CACHE STRING ""FORCE)
338 SET(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE) 376 SET(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
339 SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE) 377 SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
340 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE CACHE BOOL "") 378 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE CACHE BOOL "")
341 SET(CMAKE_INSTALL_RPATH "${EPREFIX}${PREFIX:-/usr}/lib;${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" CACHE STRING "" FORCE) 379 SET(CMAKE_INSTALL_RPATH "${EPREFIX}${PREFIX}/lib;${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" CACHE STRING "" FORCE)
342 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE) 380 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE)
343 SET(CMAKE_INSTALL_NAME_DIR "${EPREFIX}${PREFIX:-/usr}/lib" CACHE STRING "" FORCE) 381 SET(CMAKE_INSTALL_NAME_DIR "${EPREFIX}${PREFIX}/lib" CACHE STRING "" FORCE)
344 382
345 ENDIF (NOT APPLE) 383 ENDIF (NOT APPLE)
346 _EOF_ 384 _EOF_
347 fi 385 fi
348 386
349 # Common configure parameters (invariants) 387 # Common configure parameters (invariants)
350 local common_config=${CMAKE_BUILD_DIR}/gentoo_common_config.cmake 388 local common_config=${BUILD_DIR}/gentoo_common_config.cmake
351 local libdir=$(get_libdir) 389 local libdir=$(get_libdir)
352 cat > "${common_config}" <<- _EOF_ 390 cat > "${common_config}" <<- _EOF_
353 SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE) 391 SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
354 SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries") 392 SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
355 _EOF_ 393 _EOF_
368 # NOTE CMAKE_BUILD_TYPE can be only overriden via CMAKE_BUILD_TYPE eclass variable 406 # NOTE CMAKE_BUILD_TYPE can be only overriden via CMAKE_BUILD_TYPE eclass variable
369 # No -DCMAKE_BUILD_TYPE=xxx definitions will be in effect. 407 # No -DCMAKE_BUILD_TYPE=xxx definitions will be in effect.
370 local cmakeargs=( 408 local cmakeargs=(
371 --no-warn-unused-cli 409 --no-warn-unused-cli
372 -C "${common_config}" 410 -C "${common_config}"
411 -G "$(_generator_to_use)"
373 -DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX:-/usr}" 412 -DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}"
374 "${mycmakeargs_local[@]}" 413 "${mycmakeargs_local[@]}"
375 -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" 414 -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
376 -DCMAKE_INSTALL_DO_STRIP=OFF 415 -DCMAKE_INSTALL_DO_STRIP=OFF
377 -DCMAKE_USER_MAKE_RULES_OVERRIDE="${build_rules}" 416 -DCMAKE_USER_MAKE_RULES_OVERRIDE="${build_rules}"
378 "${MYCMAKEARGS}" 417 "${MYCMAKEARGS}"
379 ) 418 )
380 419
381 pushd "${CMAKE_BUILD_DIR}" > /dev/null 420 pushd "${BUILD_DIR}" > /dev/null
382 debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: mycmakeargs is ${mycmakeargs_local[*]}" 421 debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: mycmakeargs is ${mycmakeargs_local[*]}"
383 echo "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}" 422 echo "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}"
384 "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}" || die "cmake failed" 423 "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}" || die "cmake failed"
385 popd > /dev/null 424 popd > /dev/null
386} 425}
398# All arguments are passed to emake. 437# All arguments are passed to emake.
399cmake-utils_src_make() { 438cmake-utils_src_make() {
400 debug-print-function ${FUNCNAME} "$@" 439 debug-print-function ${FUNCNAME} "$@"
401 440
402 _check_build_dir 441 _check_build_dir
403 pushd "${CMAKE_BUILD_DIR}" > /dev/null 442 pushd "${BUILD_DIR}" > /dev/null
443 if [[ $(_generator_to_use) = Ninja ]]; then
404 # first check if Makefile exist otherwise die 444 # first check if Makefile exist otherwise die
445 [[ -e build.ninja ]] || die "Makefile not found. Error during configure stage."
446 if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then
447 #TODO get load average from portage (-l option)
448 ninja ${MAKEOPTS} -v "$@"
449 else
450 ninja "$@"
451 fi || die "ninja failed!"
452 else
453 # first check if Makefile exist otherwise die
405 [[ -e Makefile ]] || die "Makefile not found. Error during configure stage." 454 [[ -e Makefile ]] || die "Makefile not found. Error during configure stage."
406 if [[ -n ${CMAKE_VERBOSE} ]]; then 455 if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then
407 emake VERBOSE=1 "$@" || die "Make failed!" 456 emake VERBOSE=1 "$@" || die "Make failed!"
408 else 457 else
409 emake "$@" || die "Make failed!" 458 emake "$@" || die "Make failed!"
459 fi
410 fi 460 fi
411 popd > /dev/null 461 popd > /dev/null
412} 462}
413 463
414enable_cmake-utils_src_install() { 464enable_cmake-utils_src_install() {
415 debug-print-function ${FUNCNAME} "$@" 465 debug-print-function ${FUNCNAME} "$@"
416 466
417 _check_build_dir 467 _check_build_dir
418 pushd "${CMAKE_BUILD_DIR}" > /dev/null 468 pushd "${BUILD_DIR}" > /dev/null
469 if [[ $(_generator_to_use) = Ninja ]]; then
470 DESTDIR=${D} ninja install "$@" || die "died running ninja install"
471 base_src_install_docs
472 else
419 base_src_install "$@" 473 base_src_install "$@"
474 fi
420 popd > /dev/null 475 popd > /dev/null
421 476
422 # Backward compatibility, for non-array variables 477 # Backward compatibility, for non-array variables
423 if [[ -n "${DOCS}" ]] && [[ "$(declare -p DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then 478 if [[ -n "${DOCS}" ]] && [[ "$(declare -p DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then
424 dodoc ${DOCS} || die "dodoc failed" 479 dodoc ${DOCS} || die "dodoc failed"
431enable_cmake-utils_src_test() { 486enable_cmake-utils_src_test() {
432 debug-print-function ${FUNCNAME} "$@" 487 debug-print-function ${FUNCNAME} "$@"
433 local ctestargs 488 local ctestargs
434 489
435 _check_build_dir 490 _check_build_dir
436 pushd "${CMAKE_BUILD_DIR}" > /dev/null 491 pushd "${BUILD_DIR}" > /dev/null
437 [[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; } 492 [[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; }
438 493
439 [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" 494 [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
440 495
441 if ctest ${ctestargs} "$@" ; then 496 if ctest ${ctestargs} "$@" ; then
442 einfo "Tests succeeded." 497 einfo "Tests succeeded."
498 popd > /dev/null
499 return 0
443 else 500 else
444 if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then 501 if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then
445 # on request from Diego 502 # on request from Diego
446 eerror "Tests failed. Test log ${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log follows:" 503 eerror "Tests failed. Test log ${BUILD_DIR}/Testing/Temporary/LastTest.log follows:"
447 eerror "--START TEST LOG--------------------------------------------------------------" 504 eerror "--START TEST LOG--------------------------------------------------------------"
448 cat "${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log" 505 cat "${BUILD_DIR}/Testing/Temporary/LastTest.log"
449 eerror "--END TEST LOG----------------------------------------------------------------" 506 eerror "--END TEST LOG----------------------------------------------------------------"
450 die "Tests failed." 507 die "Tests failed."
451 else 508 else
452 die "Tests failed. When you file a bug, please attach the following file: \n\t${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log" 509 die "Tests failed. When you file a bug, please attach the following file: \n\t${BUILD_DIR}/Testing/Temporary/LastTest.log"
453 fi 510 fi
454 fi 511
512 # die might not die due to nonfatal
455 popd > /dev/null 513 popd > /dev/null
514 return 1
515 fi
456} 516}
457 517
458# @FUNCTION: cmake-utils_src_configure 518# @FUNCTION: cmake-utils_src_configure
459# @DESCRIPTION: 519# @DESCRIPTION:
460# General function for configuring with cmake. Default behaviour is to start an 520# General function for configuring with cmake. Default behaviour is to start an

Legend:
Removed from v.1.78  
changed lines
  Added in v.1.87

  ViewVC Help
Powered by ViewVC 1.1.20