From 1f2678eb10e7d7c2021857c7ddcc1aecb53442e8 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 25 Dec 2015 18:00:37 +0100 Subject: [PATCH] Fixed: Warnings compiling with Qt 5 --HG-- branch : develop --- code/CMakeModules/PCHSupport.cmake | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/code/CMakeModules/PCHSupport.cmake b/code/CMakeModules/PCHSupport.cmake index fa36fd008..20539e87f 100644 --- a/code/CMakeModules/PCHSupport.cmake +++ b/code/CMakeModules/PCHSupport.cmake @@ -40,14 +40,14 @@ MACRO(PCH_SET_COMPILE_FLAGS _target) GET_TARGET_PROPERTY(_targetType ${_target} TYPE) - SET(_USE_PIE OFF) + SET(_USE_PIC OFF) IF(${_targetType} STREQUAL "SHARED_LIBRARY" OR ${_targetType} STREQUAL "MODULE_LIBRARY") LIST(APPEND _FLAGS " ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}") ELSE() GET_TARGET_PROPERTY(_pic ${_target} POSITION_INDEPENDENT_CODE) IF(_pic) - SET(_USE_PIE ON) + SET(_USE_PIC ON) ENDIF() ENDIF() @@ -152,13 +152,12 @@ MACRO(PCH_SET_COMPILE_FLAGS _target) LIST(APPEND GLOBAL_DEFINITIONS " -DQT_NO_DEBUG") ENDIF() - # Qt5_POSITION_INDEPENDENT_CODE should be true if Qt was compiled with PIE + # Qt5_POSITION_INDEPENDENT_CODE should be true if Qt was compiled with PIC IF(Qt5_POSITION_INDEPENDENT_CODE) - SET(_USE_PIE ON) + SET(_USE_PIC ON) ENDIF() - IF(_USE_PIE) - LIST(APPEND _FLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_PIE}") + IF(_USE_PIC) LIST(APPEND _FLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_PIC}") ENDIF() ENDIF()