ENH: Replace WRITE_FILE with FILE(WRITE and FILE(APPEND. Replace MAKE_DIRECTORY with FILE(MAKE_DIRECTORY, replace STRING(ASCII things
This commit is contained in:
parent
958987c27f
commit
a17587c244
@ -5,7 +5,7 @@
|
||||
# any makefiles or projects.
|
||||
IF(NOT CMAKE_C_COMPILER_WORKS)
|
||||
MESSAGE(STATUS "Check for working C compiler: ${CMAKE_C_COMPILER}")
|
||||
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeTmp/testCCompiler.c "int main(){return 0;}")
|
||||
FILE(WRITE ${CMAKE_BINARY_DIR}/CMakeTmp/testCCompiler.c "int main(){return 0;}")
|
||||
TRY_COMPILE(CMAKE_C_COMPILER_WORKS ${CMAKE_BINARY_DIR}
|
||||
${CMAKE_BINARY_DIR}/CMakeTmp/testCCompiler.c
|
||||
OUTPUT_VARIABLE OUTPUT)
|
||||
|
@ -5,7 +5,7 @@
|
||||
# any makefiles or projects.
|
||||
IF(NOT CMAKE_CXX_COMPILER_WORKS)
|
||||
MESSAGE(STATUS "Check for working CXX compiler: ${CMAKE_CXX_COMPILER}")
|
||||
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeTmp/testCXXCompiler.cxx "int main(){return 0;}")
|
||||
FILE(WRITE ${CMAKE_BINARY_DIR}/CMakeTmp/testCXXCompiler.cxx "int main(){return 0;}")
|
||||
TRY_COMPILE(CMAKE_CXX_COMPILER_WORKS ${CMAKE_BINARY_DIR}
|
||||
${CMAKE_BINARY_DIR}/CMakeTmp/testCXXCompiler.cxx
|
||||
OUTPUT_VARIABLE OUTPUT)
|
||||
|
@ -27,9 +27,9 @@ MACRO(CHECK_FUNCTION_EXISTS FUNCTION VARIABLE)
|
||||
ELSE(${VARIABLE})
|
||||
MESSAGE(STATUS "Looking for ${FUNCTION} - not found")
|
||||
SET(${VARIABLE} "" CACHE INTERNAL "Have function ${FUNCTION}")
|
||||
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
"Determining if the function ${FUNCTION} exists failed with the following output:\n"
|
||||
"${OUTPUT}\n" APPEND)
|
||||
"${OUTPUT}\n")
|
||||
ENDIF(${VARIABLE})
|
||||
ENDIF("${VARIABLE}" MATCHES "^${VARIABLE}$")
|
||||
ENDMACRO(CHECK_FUNCTION_EXISTS)
|
||||
|
@ -25,10 +25,10 @@ MACRO(CHECK_INCLUDE_FILE INCLUDE VARIABLE)
|
||||
ELSE(${VARIABLE})
|
||||
MESSAGE(STATUS "Looking for ${INCLUDE} - not found.")
|
||||
SET(${VARIABLE} "" CACHE INTERNAL "Have include ${INCLUDE}")
|
||||
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
"Determining if the include file ${INCLUDE} "
|
||||
"exists failed with the following output:\n"
|
||||
"${OUTPUT}\n" APPEND)
|
||||
"${OUTPUT}\n")
|
||||
ENDIF(${VARIABLE})
|
||||
ENDIF("${VARIABLE}" MATCHES "^${VARIABLE}$")
|
||||
ENDMACRO(CHECK_INCLUDE_FILE)
|
||||
|
@ -22,10 +22,10 @@ MACRO(CHECK_INCLUDE_FILE_CXX INCLUDE VARIABLE)
|
||||
ELSE(${VARIABLE})
|
||||
MESSAGE(STATUS "Checking for CXX include file ${INCLUDE} -- not found")
|
||||
SET(${VARIABLE} "" CACHE INTERNAL "Have include ${INCLUDE}")
|
||||
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
"Determining if the include file ${INCLUDE} "
|
||||
"exists failed with the following output:\n"
|
||||
"${OUTPUT}\n" APPEND)
|
||||
"${OUTPUT}\n")
|
||||
ENDIF(${VARIABLE})
|
||||
ENDIF("${VARIABLE}" MATCHES "^${VARIABLE}$")
|
||||
ENDMACRO(CHECK_INCLUDE_FILE_CXX)
|
||||
|
@ -10,15 +10,13 @@ MACRO(CHECK_INCLUDE_FILES INCLUDE VARIABLE)
|
||||
IF("${VARIABLE}" MATCHES "^${VARIABLE}$")
|
||||
SET(CHECK_INCLUDE_FILES_CONTENT "/* */\n")
|
||||
SET(MACRO_CHECK_INCLUDE_FILES_FLAGS ${CMAKE_REQUIRED_FLAGS})
|
||||
STRING(ASCII 35 POUND)
|
||||
STRING(ASCII 40 41 PARENTS)
|
||||
FOREACH(FILE ${INCLUDE})
|
||||
SET(CHECK_INCLUDE_FILES_CONTENT
|
||||
"${CHECK_INCLUDE_FILES_CONTENT}${POUND}include <${FILE}>\n")
|
||||
"${CHECK_INCLUDE_FILES_CONTENT}#include <${FILE}>\n")
|
||||
ENDFOREACH(FILE)
|
||||
SET(CHECK_INCLUDE_FILES_CONTENT
|
||||
"${CHECK_INCLUDE_FILES_CONTENT}\n\nint main${PARENTS}{return 0;}\n")
|
||||
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeTmp/CheckIncludeFiles.c
|
||||
"${CHECK_INCLUDE_FILES_CONTENT}\n\nint main(){return 0;}\n")
|
||||
FILE(WRITE ${CMAKE_BINARY_DIR}/CMakeTmp/CheckIncludeFiles.c
|
||||
"${CHECK_INCLUDE_FILES_CONTENT}")
|
||||
|
||||
MESSAGE(STATUS "Looking for include files ${VARIABLE}")
|
||||
@ -34,10 +32,10 @@ MACRO(CHECK_INCLUDE_FILES INCLUDE VARIABLE)
|
||||
ELSE(${VARIABLE})
|
||||
MESSAGE(STATUS "Looking for include files ${VARIABLE} - not found.")
|
||||
SET(${VARIABLE} "" CACHE INTERNAL "Have includes ${VARIABLE}")
|
||||
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
"Determining if files ${INCLUDE} "
|
||||
"exist failed with the following output:\n"
|
||||
"${OUTPUT}\n" APPEND)
|
||||
"${OUTPUT}\n")
|
||||
ENDIF(${VARIABLE})
|
||||
ENDIF("${VARIABLE}" MATCHES "^${VARIABLE}$")
|
||||
ENDMACRO(CHECK_INCLUDE_FILES)
|
||||
|
@ -31,10 +31,10 @@ MACRO(CHECK_LIBRARY_EXISTS LIBRARY FUNCTION LOCATION VARIABLE)
|
||||
ELSE(${VARIABLE})
|
||||
MESSAGE(STATUS "Looking for ${FUNCTION} in ${LIBRARY} - not found")
|
||||
SET(${VARIABLE} "" CACHE INTERNAL "Have library ${LIBRARY}")
|
||||
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
"Determining if the function ${FUNCTION} exists in the ${LIBRARY} "
|
||||
"failed with the following output:\n"
|
||||
"${OUTPUT}\n" APPEND)
|
||||
"${OUTPUT}\n")
|
||||
ENDIF(${VARIABLE})
|
||||
ENDIF("${VARIABLE}" MATCHES "^${VARIABLE}$")
|
||||
ENDMACRO(CHECK_LIBRARY_EXISTS)
|
||||
|
@ -11,22 +11,18 @@ MACRO(CHECK_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
|
||||
IF("${VARIABLE}" MATCHES "^${VARIABLE}$")
|
||||
SET(CHECK_SYMBOL_EXISTS_CONTENT "/* */\n")
|
||||
SET(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS})
|
||||
STRING(ASCII 35 POUND)
|
||||
STRING(ASCII 40 OPEN_PARENT)
|
||||
STRING(ASCII 41 CLOSE_PARENT)
|
||||
SET(PARENTS "${OPEN_PARENT}${CLOSE_PARENT}")
|
||||
IF(CMAKE_REQUIRED_LIBRARIES)
|
||||
SET(CHECK_SYMBOL_EXISTS_LIBS
|
||||
"-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
|
||||
ENDIF(CMAKE_REQUIRED_LIBRARIES)
|
||||
FOREACH(FILE ${FILES})
|
||||
SET(CHECK_SYMBOL_EXISTS_CONTENT
|
||||
"${CHECK_SYMBOL_EXISTS_CONTENT}${POUND}include <${FILE}>\n")
|
||||
"${CHECK_SYMBOL_EXISTS_CONTENT}#include <${FILE}>\n")
|
||||
ENDFOREACH(FILE)
|
||||
SET(CHECK_SYMBOL_EXISTS_CONTENT
|
||||
"${CHECK_SYMBOL_EXISTS_CONTENT}\nvoid cmakeRequireSymbol${OPEN_PARENT}int dummy,...${CLOSE_PARENT}{${OPEN_PARENT}void${CLOSE_PARENT}dummy;}\nint main${PARENTS}\n{\n${POUND}ifndef ${SYMBOL}\n cmakeRequireSymbol${OPEN_PARENT}0,&${SYMBOL}${CLOSE_PARENT};\n${POUND}endif\n return 0;\n}\n")
|
||||
"${CHECK_SYMBOL_EXISTS_CONTENT}\nvoid cmakeRequireSymbol(int dummy,...){(void)dummy;}\nint main()\n{\n#ifndef ${SYMBOL}\n cmakeRequireSymbol(0,&${SYMBOL});\n#endif\n return 0;\n}\n")
|
||||
|
||||
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeTmp/CheckSymbolExists.c
|
||||
FILE(WRITE ${CMAKE_BINARY_DIR}/CMakeTmp/CheckSymbolExists.c
|
||||
"${CHECK_SYMBOL_EXISTS_CONTENT}")
|
||||
|
||||
MESSAGE(STATUS "Looking for ${SYMBOL}")
|
||||
@ -40,19 +36,19 @@ MACRO(CHECK_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
|
||||
IF(${VARIABLE})
|
||||
MESSAGE(STATUS "Looking for ${SYMBOL} - found")
|
||||
SET(${VARIABLE} 1 CACHE INTERNAL "Have symbol ${SYMBOL}")
|
||||
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeOutput.log
|
||||
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log
|
||||
"Determining if the ${SYMBOL} "
|
||||
"exist passed with the following output:\n"
|
||||
"${OUTPUT}\nFile ${CMAKE_BINARY_DIR}/CMakeTmp/CheckSymbolExists.c:\n"
|
||||
"${CHECK_SYMBOL_EXISTS_CONTENT}" APPEND)
|
||||
"${CHECK_SYMBOL_EXISTS_CONTENT}")
|
||||
ELSE(${VARIABLE})
|
||||
MESSAGE(STATUS "Looking for ${SYMBOL} - not found.")
|
||||
SET(${VARIABLE} "" CACHE INTERNAL "Have symbol ${SYMBOL}")
|
||||
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
"Determining if the ${SYMBOL} "
|
||||
"exist failed with the following output:\n"
|
||||
"${OUTPUT}\nFile ${CMAKE_BINARY_DIR}/CMakeTmp/CheckSymbolExists.c:\n"
|
||||
"${CHECK_SYMBOL_EXISTS_CONTENT}" APPEND)
|
||||
"${CHECK_SYMBOL_EXISTS_CONTENT}")
|
||||
ENDIF(${VARIABLE})
|
||||
ENDIF("${VARIABLE}" MATCHES "^${VARIABLE}$")
|
||||
ENDMACRO(CHECK_SYMBOL_EXISTS)
|
||||
|
@ -33,9 +33,8 @@ MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)
|
||||
MESSAGE(STATUS "Check size of ${TYPE} - done")
|
||||
ELSE(HAVE_${VARIABLE})
|
||||
MESSAGE(STATUS "Check size of ${TYPE} - failed")
|
||||
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
"Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\n"
|
||||
APPEND)
|
||||
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
"Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\n")
|
||||
ENDIF(HAVE_${VARIABLE})
|
||||
ENDIF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
|
||||
SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS )
|
||||
|
@ -26,9 +26,9 @@ MACRO(CHECK_VARIABLE_EXISTS VAR VARIABLE)
|
||||
ELSE(${VARIABLE})
|
||||
SET(${VARIABLE} "" CACHE INTERNAL "Have variable ${VAR}")
|
||||
MESSAGE(STATUS "Looking for ${VARIABLE} - not found")
|
||||
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
"Determining if the variable ${VAR} exists failed with the following output:\n"
|
||||
"${OUTPUT}\n" APPEND)
|
||||
"${OUTPUT}\n")
|
||||
ENDIF(${VARIABLE})
|
||||
ENDIF("${VARIABLE}" MATCHES "^${VARIABLE}$")
|
||||
ENDMACRO(CHECK_VARIABLE_EXISTS)
|
||||
|
@ -133,8 +133,8 @@ IF(BUILD_TESTING)
|
||||
|
||||
IF (DART_ROOT)
|
||||
# make directories in the binary tree
|
||||
MAKE_DIRECTORY(${PROJECT_BINARY_DIR}/Testing/HTML/TestingResults/Dashboard)
|
||||
MAKE_DIRECTORY(${PROJECT_BINARY_DIR}/Testing/HTML/TestingResults/Sites/${SITE}/${BUILDNAME})
|
||||
FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/Testing/HTML/TestingResults/Dashboard
|
||||
${PROJECT_BINARY_DIR}/Testing/HTML/TestingResults/Sites/${SITE}/${BUILDNAME})
|
||||
|
||||
# configure files
|
||||
CONFIGURE_FILE(
|
||||
@ -224,7 +224,7 @@ IF(BUILD_TESTING)
|
||||
|
||||
ELSE(DART_ROOT)
|
||||
# make directories in the binary tree
|
||||
MAKE_DIRECTORY(${PROJECT_BINARY_DIR}/Testing/Temporary)
|
||||
FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/Testing/Temporary)
|
||||
GET_FILENAME_COMPONENT(CMAKE_HOST_PATH ${CMAKE_COMMAND} PATH)
|
||||
SET(CMAKE_TARGET_PATH ${EXECUTABLE_OUTPUT_PATH})
|
||||
FIND_PROGRAM(CMAKE_CTEST_COMMAND ctest ${CMAKE_HOST_PATH} ${CMAKE_TARGET_PATH})
|
||||
|
@ -10,8 +10,7 @@ MACRO(TEST_BIG_ENDIAN VARIABLE)
|
||||
${CMAKE_ROOT}/Modules/TestBigEndian.c
|
||||
OUTPUT_VARIABLE OUTPUT)
|
||||
IF(NOT HAVE_${VARIABLE})
|
||||
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
"Determining the endianes of the system failed with the following output:\n${OUTPUT}\n"
|
||||
APPEND)
|
||||
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
"Determining the endianes of the system failed with the following output:\n${OUTPUT}\n")
|
||||
ENDIF(NOT HAVE_${VARIABLE})
|
||||
ENDMACRO(TEST_BIG_ENDIAN)
|
||||
|
@ -16,7 +16,7 @@ MACRO(CHECK_CXX_ACCEPTS_FLAG FLAGS VARIABLE)
|
||||
IF(${VARIABLE})
|
||||
MESSAGE(STATUS "Checking to see if CXX compiler acepts flag ${FLAGS} - yes")
|
||||
ELSE(${VARIABLE})
|
||||
WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
"Determining if the CXX compiler accepts the flag ${FLAGS} failed with the following output:\n" "${OUTPUT}\n" APPEND)
|
||||
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log
|
||||
"Determining if the CXX compiler accepts the flag ${FLAGS} failed with the following output:\n${OUTPUT}\n")
|
||||
ENDIF(${VARIABLE})
|
||||
ENDMACRO(CHECK_CXX_ACCEPTS_FLAG)
|
||||
|
Loading…
x
Reference in New Issue
Block a user