diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-01-18 20:52:54 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-01-18 20:52:54 (GMT) |
| commit | fc8ce174334c3c33141d37ff2b86ea50226b7ce4 (patch) | |
| tree | 1f911b47f1b323c1c8250cd6cc89c427c87e0860 /Modules | |
| parent | e5a4da5b3c930bf19710db638f3d1b86ccbfb3aa (diff) | |
| download | CMake-fc8ce174334c3c33141d37ff2b86ea50226b7ce4.zip CMake-fc8ce174334c3c33141d37ff2b86ea50226b7ce4.tar.gz CMake-fc8ce174334c3c33141d37ff2b86ea50226b7ce4.tar.bz2 | |
ENH: remove RAISE_SCOPE() again and instead add SET(<var> <value> PARENT_SCOPE)
Alex
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 12 | ||||
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index eea8291..c831928 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -54,8 +54,8 @@ FUNCTION(CMAKE_DETERMINE_COMPILER_ID lang flagvar src) 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 @@ FUNCTION(CMAKE_DETERMINE_COMPILER_ID_BUILD lang testflags) 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 @@ FUNCTION(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file) 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) diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index a41e43a..07dd29f 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -799,8 +799,8 @@ FUNCTION(WX_SPLIT_ARGUMENTS_ON _keyword _leftvar _rightvar) 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 @@ FUNCTION(WX_GET_DEPENDENCIES_FROM_XML 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 @@ FUNCTION(WXWIDGETS_ADD_RESOURCES _outfiles) # Add generated file to output file list. LIST(APPEND ${_outfiles} "${outfile}") - RAISE_SCOPE(${_outfiles}) + SET(${_outfiles} ${${_outfiles}} PARENT_SCOPE) ENDFUNCTION(WXWIDGETS_ADD_RESOURCES) |