[cmake-commits] alex committed CheckCSourceRuns.cmake 1.7 1.8
CheckCXXSourceRuns.cmake 1.3 1.4
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Jul 13 10:29:38 EDT 2007
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv6927
Modified Files:
CheckCSourceRuns.cmake CheckCXXSourceRuns.cmake
Log Message:
BUG: the SET( ... CACHE INTERNAL) didn't work as expected, since the
variable is already added to the cache inside cmTryRunCommand.cxx, so the
value used here was ignored. Additionally the INTERNAL made it internal,
which shouldn't be done when cross compiling, since here the user is
required to edit this variable manually e.g. using ccmake.
Alex
Index: CheckCXXSourceRuns.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CheckCXXSourceRuns.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CheckCXXSourceRuns.cmake 1 Jun 2007 15:16:29 -0000 1.3
+++ CheckCXXSourceRuns.cmake 13 Jul 2007 14:29:36 -0000 1.4
@@ -48,7 +48,6 @@
# if the return value was 0 then it worked
SET(result_var ${${VAR}})
IF("${result_var}" EQUAL 0)
- 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"
@@ -57,7 +56,6 @@
"Source file was:\n${SOURCE}\n")
ELSE("${result_var}" EQUAL 0)
MESSAGE(STATUS "Performing Test ${VAR} - Failed")
- 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"
Index: CheckCSourceRuns.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CheckCSourceRuns.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CheckCSourceRuns.cmake 1 Jun 2007 15:16:29 -0000 1.7
+++ CheckCSourceRuns.cmake 13 Jul 2007 14:29:36 -0000 1.8
@@ -47,7 +47,6 @@
# if the return value was 0 then it worked
SET(result_var ${${VAR}})
IF("${result_var}" EQUAL 0)
- 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 +55,6 @@
"Source file was:\n${SOURCE}\n")
ELSE("${result_var}" EQUAL 0)
MESSAGE(STATUS "Performing Test ${VAR} - Failed")
- 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"
More information about the Cmake-commits
mailing list