kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make add_compiler_export_flags a function again.

Browse Source 
Making this a macro had unintended issues on (among others) Windows
compilers. Moving it back to being a function using PARENT_SCOPE still
satisfies the use case where we simply want to obtain the extra flags.
This commit is contained in:
Marcus D. Hanwell 2011-09-20 00:16:16 -04:00
parent 6a10deb670
commit 41e2b1d824
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/GenerateExportHeader.cmake
View File

@ -1,6 +1,6 @@
# - Function for generation of export macros for libraries # - Function for generation of export macros for libraries
# This module provides the function GENERATE_EXPORT_HEADER() and the # This module provides the function GENERATE_EXPORT_HEADER() and the
# accompanying ADD_COMPILER_EXPORT_FLAGS() macro. # accompanying ADD_COMPILER_EXPORT_FLAGS() function.
# #
# The GENERATE_EXPORT_HEADER function can be used to generate a file suitable # The GENERATE_EXPORT_HEADER function can be used to generate a file suitable
# for preprocessor inclusion which contains EXPORT macros to be used in # for preprocessor inclusion which contains EXPORT macros to be used in
@ -21,7 +21,7 @@
# ADD_COMPILER_EXPORT_FLAGS( [FATAL_WARNINGS] ) # ADD_COMPILER_EXPORT_FLAGS( [FATAL_WARNINGS] )
# #
# By default GENERATE_EXPORT_HEADER() generates macro names in a file name # By default GENERATE_EXPORT_HEADER() generates macro names in a file name
# determined by the name of the library. The ADD_COMPILER_EXPORT_FLAGS macro # determined by the name of the library. The ADD_COMPILER_EXPORT_FLAGS function
# adds -fvisibility=hidden to CMAKE_CXX_FLAGS if supported, and is a no-op on # adds -fvisibility=hidden to CMAKE_CXX_FLAGS if supported, and is a no-op on
# Windows which does not need extra compiler flags for exporting support. You # Windows which does not need extra compiler flags for exporting support. You
# may optionally pass a single argument to ADD_COMPILER_EXPORT_FLAGS that will # may optionally pass a single argument to ADD_COMPILER_EXPORT_FLAGS that will
@ -351,7 +351,7 @@ function(GENERATE_EXPORT_HEADER TARGET_LIBRARY)
_do_generate_export_header(${TARGET_LIBRARY} ${ARGN}) _do_generate_export_header(${TARGET_LIBRARY} ${ARGN})
endfunction() endfunction()
macro(add_compiler_export_flags) function(add_compiler_export_flags)
_test_compiler_hidden_visibility() _test_compiler_hidden_visibility()
_test_compiler_has_deprecated() _test_compiler_has_deprecated()
@ -370,8 +370,8 @@ macro(add_compiler_export_flags)
# Either return the extra flags needed in the supplied argument, or to the # Either return the extra flags needed in the supplied argument, or to the
# CMAKE_CXX_FLAGS if no argument is supplied. # CMAKE_CXX_FLAGS if no argument is supplied.
if(ARGV0) if(ARGV0)
set(${ARGV0} "${EXTRA_FLAGS}") set(${ARGV0} "${EXTRA_FLAGS}" PARENT_SCOPE)
else() else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_FLAGS}" PARENT_SCOPE)
endif() endif()
endmacro() endfunction()