From 4a323bde0cc23a425ee6589c13bee3b9644942c4 Mon Sep 17 00:00:00 2001 From: David Cole Date: Tue, 21 Sep 2010 21:46:52 -0400 Subject: Honor MAKECOMMAND value saved in cache (#11026) Use a separate variable to pass to the BUILD_COMMAND call and then use set(CACHE) to transfer that to MAKECOMMAND. That way, if MAKECOMMAND is in the cache already, it is left untouched. Fixes regression introduced in commit 0b38bb4c with the fix for bug #2336. Thanks to Evgeniy P for the patch. --- Modules/CTest.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake index e3157fa..bb76ddd 100644 --- a/Modules/CTest.cmake +++ b/Modules/CTest.cmake @@ -228,8 +228,10 @@ IF(BUILD_TESTING) ENDIF(NOT BUILDNAME) # the build command - BUILD_COMMAND(MAKECOMMAND CONFIGURATION "\${CTEST_CONFIGURATION_TYPE}") - SET(MAKECOMMAND ${MAKECOMMAND} CACHE STRING "Command to build the project") + BUILD_COMMAND(MAKECOMMAND_DEFAULT_VALUE + CONFIGURATION "\${CTEST_CONFIGURATION_TYPE}") + SET(MAKECOMMAND ${MAKECOMMAND_DEFAULT_VALUE} + CACHE STRING "Command to build the project") # the default build configuration the ctest build handler will use # if there is no -C arg given to ctest: -- cgit v0.12 ch'/> https://github.com/python/cpython.git
summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* bpo-37760: Mark all generated Unicode data headers as generated. (GH-15171)Greg Price2019-08-131-1/+1
* bpo-37760: Factor out the basic UCD parsing logic of makeunicodedata. (GH-15130)Greg Price2019-08-131-133/+109
* bpo-37759: Second round of edits to Whatsnew 3.8 (GH-15204)Raymond Hettinger2019-08-121-20/+88
* Remove versioned executables from non-APPX packages (GH-15237)Steve Dower2019-08-121-3/+0
* bpo-37354: Sign Activate.ps1 for release (GH-15235)Steve Dower2019-08-126-4/+29
* bpo-37354: Make Powershell Activate.ps1 script static to allow for signing (G...Derek Keeler2019-08-122-28/+204
* bpo-37804: Remove the deprecated method threading.Thread.isAlive() (GH-15225)Dong-hee Na2019-08-124-12/+6
* Fix docs for assert_called and assert_called_once (#15197)Ismail S2019-08-121-2/+2
* bpo-37819: Add Fraction.as_integer_ratio() (GH-15212)Raymond Hettinger2019-08-114-0/+23
* bpo-32178: Fix IndexError trying to parse 'To' header starting with ':'. (GH-...Abhilash Raj2019-08-113-1/+12
* Delete leftover clinic-generated file for C zipimport. (GH-15174)Greg Price2019-08-101-325/+0
* bpo-32912: Revert SyntaxWarning on invalid escape sequences. (GH-15195)Gregory P. Smith2019-08-106-18/+43
* bpo-37642: Update acceptable offsets in timezone (GH-14878)Ngalim Siregar2019-08-095-5/+44
* bpo-36511: Fix failures in Windows ARM32 buildbot (GH-15181)Paul Monson2019-08-082-0/+2
* bpo-37795: Capture DeprecationWarnings in the test suite (GH-15184)Pablo Galindo2019-08-082-3/+11
* bpo-37268: test_parser fails when run with -Werror (GH-15183)Zackery Spytz2019-08-081-1/+5
* bpo-25172: Raise appropriate ImportError msg when crypt module used on Window...shireenrao2019-08-082-1/+11
* bpo-37587: optimize json.loads (GH-15134)Inada Naoki2019-08-081-20/+19
* bpo-35892: Add usage note to mode() (GH-15122)Raymond Hettinger2019-08-081-1/+3
* bpo-37685: Use singletons ALWAYS_EQ and NEVER_EQ in more tests. (GH-15167)Serhiy Storchaka2019-08-089-57/+30
* bpo-37685: Fixed __eq__, __lt__ etc implementations in some classes. (GH-14952)Serhiy Storchaka2019-08-08