From 8b9d44d512f172116f28fb640b7cfb3e5bb8a4d8 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Mon, 21 Aug 2006 10:10:28 -0400 Subject: ENH: fixs for check compile stuff from Oswald B. --- Modules/CheckCSourceCompiles.cmake | 4 ++-- Modules/CheckCSourceRuns.cmake | 8 ++++---- Modules/CheckCXXSourceCompiles.cmake | 6 +++--- Modules/CheckCXXSourceRuns.cmake | 13 +++++++------ 4 files changed, 16 insertions(+), 15 deletions(-) (limited to 'Modules') diff --git a/Modules/CheckCSourceCompiles.cmake b/Modules/CheckCSourceCompiles.cmake index 21dc50e2e1..c6ef220f05 100644 --- a/Modules/CheckCSourceCompiles.cmake +++ b/Modules/CheckCSourceCompiles.cmake @@ -41,7 +41,7 @@ MACRO(CHECK_C_SOURCE_COMPILES SOURCE VAR) "${CHECK_C_SOURCE_COMPILES_ADD_INCLUDES}" OUTPUT_VARIABLE OUTPUT) IF(${VAR}) - SET(${VAR} 1 CACHE INTERNAL "Test ${FUNCTION}") + SET(${VAR} 1 CACHE INTERNAL "Test ${VAR}") MESSAGE(STATUS "Performing Test ${VAR} - Success") FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log "Performing C SOURCE FILE Test ${VAR} succeded with the following output:\n" @@ -49,7 +49,7 @@ MACRO(CHECK_C_SOURCE_COMPILES SOURCE VAR) "Source file was:\n${SOURCE}\n") ELSE(${VAR}) MESSAGE(STATUS "Performing Test ${VAR} - Failed") - SET(${VAR} "" CACHE INTERNAL "Test ${FUNCTION}") + SET(${VAR} "" CACHE INTERNAL "Test ${VAR}") FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log "Performing C SOURCE FILE Test ${VAR} failed with the following output:\n" "${OUTPUT}\n" diff --git a/Modules/CheckCSourceRuns.cmake b/Modules/CheckCSourceRuns.cmake index 9bbde09030..d843e9a8a1 100644 --- a/Modules/CheckCSourceRuns.cmake +++ b/Modules/CheckCSourceRuns.cmake @@ -41,13 +41,13 @@ MACRO(CHECK_C_SOURCE_RUNS SOURCE VAR) "${CHECK_C_SOURCE_COMPILES_ADD_INCLUDES}" OUTPUT_VARIABLE OUTPUT) # if it did not compile make the return value fail code of 1 - IF(NOT ${${VAR}_COMPILED}) + IF(NOT ${VAR}_COMPILED) SET(${VAR} 1) - ENDIF(NOT ${${VAR}_COMPILED}) + ENDIF(NOT ${VAR}_COMPILED) # if the return value was 0 then it worked SET(result_var ${${VAR}}) IF("${result_var}" EQUAL 0) - SET(${VAR} 1 CACHE INTERNAL "Test ${FUNCTION}") + SET(${VAR} 1 CACHE INTERNAL "Test ${VAR}") MESSAGE(STATUS "Performing Test ${VAR} - Success") FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log "Performing C SOURCE FILE Test ${VAR} succeded with the following output:\n" @@ -56,7 +56,7 @@ MACRO(CHECK_C_SOURCE_RUNS SOURCE VAR) "Source file was:\n${SOURCE}\n") ELSE("${result_var}" EQUAL 0) MESSAGE(STATUS "Performing Test ${VAR} - Failed") - SET(${VAR} "" CACHE INTERNAL "Test ${FUNCTION}") + SET(${VAR} "" CACHE INTERNAL "Test ${VAR}") FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log "Performing C SOURCE FILE Test ${VAR} failed with the following output:\n" "${OUTPUT}\n" diff --git a/Modules/CheckCXXSourceCompiles.cmake b/Modules/CheckCXXSourceCompiles.cmake index d8b8960940..8f9dec2d2a 100644 --- a/Modules/CheckCXXSourceCompiles.cmake +++ b/Modules/CheckCXXSourceCompiles.cmake @@ -1,6 +1,6 @@ # - Check if the source code provided in the SOURCE argument compiles. # CHECK_CXX_SOURCE_COMPILES(SOURCE VAR) -# - macro which checks if the source code compiles\ +# - macro which checks if the source code compiles # SOURCE - source code to try to compile # VAR - variable to store size if the type exists. # @@ -41,7 +41,7 @@ MACRO(CHECK_CXX_SOURCE_COMPILES SOURCE VAR) "${CHECK_CXX_SOURCE_COMPILES_ADD_INCLUDES}" OUTPUT_VARIABLE OUTPUT) IF(${VAR}) - SET(${VAR} 1 CACHE INTERNAL "Test ${FUNCTION}") + SET(${VAR} 1 CACHE INTERNAL "Test ${VAR}") MESSAGE(STATUS "Performing Test ${VAR} - Success") FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log "Performing C++ SOURCE FILE Test ${VAR} succeded with the following output:\n" @@ -49,7 +49,7 @@ MACRO(CHECK_CXX_SOURCE_COMPILES SOURCE VAR) "Source file was:\n${SOURCE}\n") ELSE(${VAR}) MESSAGE(STATUS "Performing Test ${VAR} - Failed") - SET(${VAR} "" CACHE INTERNAL "Test ${FUNCTION}") + SET(${VAR} "" CACHE INTERNAL "Test ${VAR}") FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log "Performing C++ SOURCE FILE Test ${VAR} failed with the following output:\n" "${OUTPUT}\n" diff --git a/Modules/CheckCXXSourceRuns.cmake b/Modules/CheckCXXSourceRuns.cmake index 8cb05f0e3a..04ae7a964f 100644 --- a/Modules/CheckCXXSourceRuns.cmake +++ b/Modules/CheckCXXSourceRuns.cmake @@ -1,5 +1,6 @@ -# - Check if the source code provided in the SOURCE argument compiles and runs.# CHECK_CXX_SOURCE_RUNS(SOURCE VAR) -# - macro which checks if the source code compiles\ +# - Check if the source code provided in the SOURCE argument compiles and runs. +# CHECK_CXX_SOURCE_RUNS(SOURCE VAR) +# - macro which checks if the source code compiles # SOURCE - source code to try to compile # VAR - variable to store size if the type exists. # @@ -40,13 +41,13 @@ MACRO(CHECK_CXX_SOURCE_RUNS SOURCE VAR) "${CHECK_CXX_SOURCE_COMPILES_ADD_INCLUDES}" OUTPUT_VARIABLE OUTPUT) # if it did not compile make the return value fail code of 1 - IF(NOT ${${VAR}_COMPILED}) + IF(NOT ${VAR}_COMPILED) SET(${VAR} 1) - ENDIF(NOT ${${VAR}_COMPILED}) + ENDIF(NOT ${VAR}_COMPILED) # if the return value was 0 then it worked SET(result_var ${${VAR}}) IF("${result_var}" EQUAL 0) - SET(${VAR} 1 CACHE INTERNAL "Test ${FUNCTION}") + SET(${VAR} 1 CACHE INTERNAL "Test ${VAR}") MESSAGE(STATUS "Performing Test ${VAR} - Success") FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log "Performing C++ SOURCE FILE Test ${VAR} succeded with the following output:\n" @@ -55,7 +56,7 @@ MACRO(CHECK_CXX_SOURCE_RUNS SOURCE VAR) "Source file was:\n${SOURCE}\n") ELSE("${result_var}" EQUAL 0) MESSAGE(STATUS "Performing Test ${VAR} - Failed") - SET(${VAR} "" CACHE INTERNAL "Test ${FUNCTION}") + SET(${VAR} "" CACHE INTERNAL "Test ${VAR}") FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log "Performing C++ SOURCE FILE Test ${VAR} failed with the following output:\n" "${OUTPUT}\n" -- cgit v1.2.1