summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Modules/CheckFunctionExists.cmake8
-rw-r--r--Modules/CheckIncludeFile.cmake12
-rw-r--r--Modules/CheckSizeOf.cmake8
-rw-r--r--Source/WXDialog/cmWXMainFrame.cxx1
4 files changed, 11 insertions, 18 deletions
diff --git a/Modules/CheckFunctionExists.cmake b/Modules/CheckFunctionExists.cmake
index 4e57816..3640fd9 100644
--- a/Modules/CheckFunctionExists.cmake
+++ b/Modules/CheckFunctionExists.cmake
@@ -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)
diff --git a/Modules/CheckIncludeFile.cmake b/Modules/CheckIncludeFile.cmake
index 8a35900..6dadfbf 100644
--- a/Modules/CheckIncludeFile.cmake
+++ b/Modules/CheckIncludeFile.cmake
@@ -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)
diff --git a/Modules/CheckSizeOf.cmake b/Modules/CheckSizeOf.cmake
index 8f1b122..34f8d50 100644
--- a/Modules/CheckSizeOf.cmake
+++ b/Modules/CheckSizeOf.cmake
@@ -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)
diff --git a/Source/WXDialog/cmWXMainFrame.cxx b/Source/WXDialog/cmWXMainFrame.cxx
index 137d916..efe0609 100644
--- a/Source/WXDialog/cmWXMainFrame.cxx
+++ b/Source/WXDialog/cmWXMainFrame.cxx
@@ -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);
}