kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: try to fix the test failures on dash2

Browse Source 
Alex
This commit is contained in:
Alexander Neundorf 2007-05-24 14:30:09 -04:00
parent 7147c3e1cc
commit 504ea6df4e
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CheckTypeSize.cmake
View File

@ -55,6 +55,8 @@ MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)
"${CHECK_TYPE_SIZE_ADD_LIBRARIES}" "${CHECK_TYPE_SIZE_ADD_LIBRARIES}"
"${CHECK_TYPE_SIZE_ADD_INCLUDES}" "${CHECK_TYPE_SIZE_ADD_INCLUDES}"
OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)
message(STATUS "debug: COMPILE: ${HAVE_${VARIABLE}} RUN: ${${VARIABLE}} OUT: ${OUTPUT}")
IF(HAVE_${VARIABLE}) IF(HAVE_${VARIABLE})
MESSAGE(STATUS "Check size of ${TYPE} - done") MESSAGE(STATUS "Check size of ${TYPE} - done")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log

6
Source/cmTryRunCommand.cxx
View File

@ -73,6 +73,8 @@ bool cmTryRunCommand::InitialPass(std::vector<std::string> const& argv)
// do the try compile // do the try compile
int res = this->TryCompileCode(tryCompile); int res = this->TryCompileCode(tryCompile);
printf("TryCompile: %d outputFile: -%s-\n", res, this->OutputFile.c_str());
// now try running the command if it compiled // now try running the command if it compiled
if (!res) if (!res)
{ {
@ -94,6 +96,10 @@ bool cmTryRunCommand::InitialPass(std::vector<std::string> const& argv)
bool worked = cmSystemTools::RunSingleCommand(finalCommand.c_str(), bool worked = cmSystemTools::RunSingleCommand(finalCommand.c_str(),
&output, &retVal, &output, &retVal,
0, false, timeout); 0, false, timeout);
printf("worked: %d output: -%s-\n", worked?1:0, output.c_str());
if(outputVariable.size()) if(outputVariable.size())
{ {
// if the TryCompileCore saved output in this outputVariable then // if the TryCompileCore saved output in this outputVariable then