Merge topic 'GenerateExportHeader-fix-add_compiler_export_flags'

0cbaaf2d GenerateExportHeader: Fix add_compiler_export_flags regression
This commit is contained in:
Brad King 2016-09-02 09:22:28 -04:00 committed by CMake Topic Stage
commit ee45fce4a4
1 changed files with 2 additions and 1 deletions

View File

@ -415,6 +415,7 @@ function(add_compiler_export_flags)
if(ARGC GREATER 0)
set(${ARGV0} "${EXTRA_FLAGS}" PARENT_SCOPE)
else()
string(APPEND CMAKE_CXX_FLAGS " ${EXTRA_FLAGS}" PARENT_SCOPE)
string(APPEND CMAKE_CXX_FLAGS " ${EXTRA_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" PARENT_SCOPE)
endif()
endfunction()