Commit 28159ebd authored by Andy Cedilnik's avatar Andy Cedilnik

Fix tests for new trycompile and tryrun

parent 202600f9
......@@ -7,16 +7,14 @@
#
MACRO(CHECK_FUNCTION_EXISTS FUNCTION VARIABLE)
TRY_COMPILE(COMPILE_OK
TRY_COMPILE(${VARIABLE}
${PROJECT_BINARY_DIR}
${CMAKE_ROOT}/Modules/CheckFunctionExists.c
COMPILE_DEFINITIONS -DCHECK_FUNCTION_EXISTS=${FUNCTION}
OUTPUT_VARIABLE OUTPUT)
IF(COMPILE_OK)
SET(${VARIABLE} ${COMPILE_OK})
ELSE(COMPILE_OK)
IF(NOT ${VARIABLE})
WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log
"Determining if the function ${FUNCTION} exists failed with the following output:\n"
"${OUTPUT}\n")
ENDIF(COMPILE_OK)
ENDIF(NOT ${VARIABLE})
ENDMACRO(CHECK_FUNCTION_EXISTS)
......@@ -9,17 +9,15 @@
MACRO(CHECK_INCLUDE_FILE INCLUDE VARIABLE)
SET(CHECK_INCLUDE_FILE_VAR ${INCLUDE})
CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CheckIncludeFile.c.in
${PROJECT_BINARY_DIR}/CheckIncludeFile.c IMMEDIATE)
TRY_COMPILE(COMPILE_OK
${PROJECT_BINARY_DIR}/CMakeTmp/CheckIncludeFile.c IMMEDIATE)
TRY_COMPILE(${VARIABLE}
${PROJECT_BINARY_DIR}
${PROJECT_BINARY_DIR}/CheckIncludeFile.c
${PROJECT_BINARY_DIR}/CMakeTmp/CheckIncludeFile.c
OUTPUT_VARIABLE OUTPUT)
IF(COMPILE_OK)
SET(${VARIABLE} ${COMPILE_OK})
ELSE(COMPILE_OK)
IF(NOT ${VARIABLE})
WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log
"Determining if the include file ${INCLUDE} "
"exists failed with the following output:\n"
"${OUTPUT}\n")
ENDIF(COMPILE_OK)
ENDIF(NOT ${VARIABLE})
ENDMACRO(CHECK_INCLUDE_FILE)
......@@ -7,15 +7,13 @@
#
MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)
TRY_RUN(RUN_RESULT COMPILE_OK
TRY_RUN(${VARIABLE} HAVE_${VARIABLE}
${PROJECT_BINARY_DIR}
${CMAKE_ROOT}/Modules/CheckSizeOf.c
COMPILE_DEFINITIONS -DCHECK_SIZE_OF="${TYPE}"
OUTPUT_VARIABLE OUTPUT)
IF(COMPILE_OK)
SET(${VARIABLE} ${RUN_RESULT})
ELSE(COMPILE_OK)
IF(NOT HAVE_${VARIABLE})
WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log
"Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\n")
ENDIF(COMPILE_OK)
ENDIF(NOT HAVE_${VARIABLE})
ENDMACRO(CHECK_TYPE_SIZE)
......@@ -601,7 +601,6 @@ void cmMainFrame::Initialize(cmCommandLineInfo* cmdInfo)
if ( cmdInfo->m_ExitAfterLoad )
{
std::cout << "Set timer" << std::endl;
this->m_ExitTimer = new wxTimer(this, this->GetId());
this->m_ExitTimer->Start(3000);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment