[cmake-commits] alex committed CMakeDetermineCompilerId.cmake 1.15 1.16 FindwxWidgets.cmake 1.17 1.18

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv32005/Modules

Modified Files:
	CMakeDetermineCompilerId.cmake FindwxWidgets.cmake 
Log Message:
ENH: remove RAISE_SCOPE() again and instead add SET(<var> <value> PARENT_SCOPE)

Alex


Index: FindwxWidgets.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindwxWidgets.cmake,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- FindwxWidgets.cmake	6 Jan 2008 01:37:51 -0000	1.17
+++ FindwxWidgets.cmake	18 Jan 2008 20:52:53 -0000	1.18
@@ -799,8 +799,8 @@
     ENDIF("${element}" STREQUAL "${_keyword}")
   ENDFOREACH(element)
 
-  RAISE_SCOPE(${_leftvar})
-  RAISE_SCOPE(${_rightvar})
+  SET(${_leftvar}  ${${_leftvar}}  PARENT_SCOPE)
+  SET(${_rightvar} ${${_rightvar}} PARENT_SCOPE)
 ENDFUNCTION(WX_SPLIT_ARGUMENTS_ON)
 
 #
@@ -839,7 +839,7 @@
     LIST(APPEND ${_depends} "${dep_file}")
   ENDFOREACH(dep_file)
 
-  RAISE_SCOPE(${_depends})
+  SET(${_depends} ${${_depends}} PARENT_SCOPE)
 ENDFUNCTION(WX_GET_DEPENDENCIES_FROM_XML)
 
 # 
@@ -953,5 +953,5 @@
   # Add generated file to output file list.
   LIST(APPEND ${_outfiles} "${outfile}")
 
-  RAISE_SCOPE(${_outfiles})
+  SET(${_outfiles} ${${_outfiles}} PARENT_SCOPE)
 ENDFUNCTION(WXWIDGETS_ADD_RESOURCES)

Index: CMakeDetermineCompilerId.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCompilerId.cmake,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- CMakeDetermineCompilerId.cmake	7 Jan 2008 15:27:28 -0000	1.15
+++ CMakeDetermineCompilerId.cmake	18 Jan 2008 20:52:53 -0000	1.16
@@ -54,8 +54,8 @@
     MESSAGE(STATUS "The ${lang} compiler identification is unknown")
   ENDIF(CMAKE_${lang}_COMPILER_ID)
 
-  RAISE_SCOPE(CMAKE_${lang}_COMPILER_ID "${CMAKE_${lang}_COMPILER_ID}")
-  RAISE_SCOPE(CMAKE_${lang}_PLATFORM_ID "${CMAKE_${lang}_PLATFORM_ID}")
+  SET(CMAKE_${lang}_COMPILER_ID "${CMAKE_${lang}_COMPILER_ID}" PARENT_SCOPE)
+  SET(CMAKE_${lang}_PLATFORM_ID "${CMAKE_${lang}_PLATFORM_ID}" PARENT_SCOPE)
 ENDFUNCTION(CMAKE_DETERMINE_COMPILER_ID)
 
 #-----------------------------------------------------------------------------
@@ -146,7 +146,7 @@
   ENDIF(CMAKE_${lang}_COMPILER_ID_RESULT)
 
   # Return the files produced by the compilation.
-  RAISE_SCOPE(COMPILER_${lang}_PRODUCED_FILES "${COMPILER_${lang}_PRODUCED_FILES}")
+  SET(COMPILER_${lang}_PRODUCED_FILES "${COMPILER_${lang}_PRODUCED_FILES}" PARENT_SCOPE)
 ENDFUNCTION(CMAKE_DETERMINE_COMPILER_ID_BUILD lang testflags)
 
 #-----------------------------------------------------------------------------
@@ -219,7 +219,7 @@
   ENDIF(NOT CMAKE_EXECUTABLE_FORMAT)
 
   # Return the information extracted.
-  RAISE_SCOPE(CMAKE_${lang}_COMPILER_ID "${CMAKE_${lang}_COMPILER_ID}")
-  RAISE_SCOPE(CMAKE_${lang}_PLATFORM_ID "${CMAKE_${lang}_PLATFORM_ID}")
-  RAISE_SCOPE(CMAKE_EXECUTABLE_FORMAT "${CMAKE_EXECUTABLE_FORMAT}")
+  SET(CMAKE_${lang}_COMPILER_ID "${CMAKE_${lang}_COMPILER_ID}" PARENT_SCOPE)
+  SET(CMAKE_${lang}_PLATFORM_ID "${CMAKE_${lang}_PLATFORM_ID}" PARENT_SCOPE)
+  SET(CMAKE_EXECUTABLE_FORMAT "${CMAKE_EXECUTABLE_FORMAT}" PARENT_SCOPE)
 ENDFUNCTION(CMAKE_DETERMINE_COMPILER_ID_CHECK lang)