Merge with develop

This commit is contained in:
kervala 2015-12-07 13:09:07 +01:00
parent 5231e60816
commit b89fcda4db

View file

@ -380,11 +380,7 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _inputh _inputcpp)
ENDMACRO()
MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _inputh _inputcpp)
IF(NOT PCHSupport_FOUND)
MESSAGE(STATUS "PCH disabled because compiler doesn't support them")
RETURN()
ENDIF()
IF(PCHSupport_FOUND)
# 0 => creating a new target for PCH, works for all makefiles
# 1 => setting PCH for VC++ project, works for VC++ projects
# 2 => setting PCH for XCode project, works for XCode projects
@ -429,4 +425,7 @@ MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _inputh _inputcpp)
IF(TARGET ${_targetName}_static)
ADD_NATIVE_PRECOMPILED_HEADER(${_targetName}_static ${_inputh} ${_inputcpp})
ENDIF()
ELSE()
MESSAGE(STATUS "PCH disabled because compiler doesn't support them")
ENDIF()
ENDMACRO()