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

Fix tests for new trycompile and tryrun

Browse Source
This commit is contained in:
Andy Cedilnik 2002-09-20 15:01:27 -04:00
parent 202600f95a
commit 28159ebd71
4 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/CheckFunctionExists.cmake
View File

@ -7,16 +7,14 @@
# #
MACRO(CHECK_FUNCTION_EXISTS FUNCTION VARIABLE) MACRO(CHECK_FUNCTION_EXISTS FUNCTION VARIABLE)
TRY_COMPILE(COMPILE_OK TRY_COMPILE(${VARIABLE}
${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}
${CMAKE_ROOT}/Modules/CheckFunctionExists.c ${CMAKE_ROOT}/Modules/CheckFunctionExists.c
COMPILE_DEFINITIONS -DCHECK_FUNCTION_EXISTS=${FUNCTION} COMPILE_DEFINITIONS -DCHECK_FUNCTION_EXISTS=${FUNCTION}
OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)
IF(COMPILE_OK) IF(NOT ${VARIABLE})
SET(${VARIABLE} ${COMPILE_OK})
ELSE(COMPILE_OK)
WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log
"Determining if the function ${FUNCTION} exists failed with the following output:\n" "Determining if the function ${FUNCTION} exists failed with the following output:\n"
"${OUTPUT}\n") "${OUTPUT}\n")
ENDIF(COMPILE_OK) ENDIF(NOT ${VARIABLE})
ENDMACRO(CHECK_FUNCTION_EXISTS) ENDMACRO(CHECK_FUNCTION_EXISTS)

12
Modules/CheckIncludeFile.cmake
View File

@ -9,17 +9,15 @@
MACRO(CHECK_INCLUDE_FILE INCLUDE VARIABLE) MACRO(CHECK_INCLUDE_FILE INCLUDE VARIABLE)
SET(CHECK_INCLUDE_FILE_VAR ${INCLUDE}) SET(CHECK_INCLUDE_FILE_VAR ${INCLUDE})
CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CheckIncludeFile.c.in CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CheckIncludeFile.c.in
${PROJECT_BINARY_DIR}/CheckIncludeFile.c IMMEDIATE) ${PROJECT_BINARY_DIR}/CMakeTmp/CheckIncludeFile.c IMMEDIATE)
TRY_COMPILE(COMPILE_OK TRY_COMPILE(${VARIABLE}
${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}
${PROJECT_BINARY_DIR}/CheckIncludeFile.c ${PROJECT_BINARY_DIR}/CMakeTmp/CheckIncludeFile.c
OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)
IF(COMPILE_OK) IF(NOT ${VARIABLE})
SET(${VARIABLE} ${COMPILE_OK})
ELSE(COMPILE_OK)
WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log
"Determining if the include file ${INCLUDE} " "Determining if the include file ${INCLUDE} "
"exists failed with the following output:\n" "exists failed with the following output:\n"
"${OUTPUT}\n") "${OUTPUT}\n")
ENDIF(COMPILE_OK) ENDIF(NOT ${VARIABLE})
ENDMACRO(CHECK_INCLUDE_FILE) ENDMACRO(CHECK_INCLUDE_FILE)

8
Modules/CheckSizeOf.cmake
View File

@ -7,15 +7,13 @@
# #
MACRO(CHECK_TYPE_SIZE TYPE VARIABLE) MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)
TRY_RUN(RUN_RESULT COMPILE_OK TRY_RUN(${VARIABLE} HAVE_${VARIABLE}
${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}
${CMAKE_ROOT}/Modules/CheckSizeOf.c ${CMAKE_ROOT}/Modules/CheckSizeOf.c
COMPILE_DEFINITIONS -DCHECK_SIZE_OF="${TYPE}" COMPILE_DEFINITIONS -DCHECK_SIZE_OF="${TYPE}"
OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)
IF(COMPILE_OK) IF(NOT HAVE_${VARIABLE})
SET(${VARIABLE} ${RUN_RESULT})
ELSE(COMPILE_OK)
WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log
"Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\n") "Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\n")
ENDIF(COMPILE_OK) ENDIF(NOT HAVE_${VARIABLE})
ENDMACRO(CHECK_TYPE_SIZE) ENDMACRO(CHECK_TYPE_SIZE)

1
Source/WXDialog/cmWXMainFrame.cxx
View File

@ -601,7 +601,6 @@ void cmMainFrame::Initialize(cmCommandLineInfo* cmdInfo)
if ( cmdInfo->m_ExitAfterLoad ) if ( cmdInfo->m_ExitAfterLoad )
{ {
std::cout << "Set timer" << std::endl;
this->m_ExitTimer = new wxTimer(this, this->GetId()); this->m_ExitTimer = new wxTimer(this, this->GetId());
this->m_ExitTimer->Start(3000); this->m_ExitTimer->Start(3000);
} }