Merge with develop

--HG--
branch : compatibility-develop

code/CMakeModules/PCHSupport.cmake

@@ -380,53 +380,52 @@ 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
+    IF(CMAKE_GENERATOR MATCHES "Visual Studio")
+      SET(PCH_METHOD 1)
+    ELSEIF(CMAKE_GENERATOR MATCHES "Xcode")
+      SET(PCH_METHOD 2)
+    ELSE()
+      SET(PCH_METHOD 0)
+    ENDIF()
 
-  # 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
-  IF(CMAKE_GENERATOR MATCHES "Visual Studio")
-    SET(PCH_METHOD 1)
-  ELSEIF(CMAKE_GENERATOR MATCHES "Xcode")
-    SET(PCH_METHOD 2)
-  ELSE()
-    SET(PCH_METHOD 0)
-  ENDIF()
+    IF(PCH_METHOD EQUAL 1)
+      # Auto include the precompile (useful for moc processing, since the use of
+      # precompiled is specified at the target level
+      # and I don't want to specifiy /F- for each moc/res/ui generated files (using Qt)
 
-  IF(PCH_METHOD EQUAL 1)
-    # Auto include the precompile (useful for moc processing, since the use of
-    # precompiled is specified at the target level
-    # and I don't want to specifiy /F- for each moc/res/ui generated files (using Qt)
+      GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS)
+      IF(${oldProps} MATCHES NOTFOUND)
+        SET(oldProps "")
+      ENDIF()
 
-    GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS)
-    IF(${oldProps} MATCHES NOTFOUND)
-      SET(oldProps "")
-    ENDIF()
+      SET(newProperties "${oldProps} /Yu\"${_inputh}\" /FI\"${_inputh}\"")
+      SET_TARGET_PROPERTIES(${_targetName} PROPERTIES COMPILE_FLAGS "${newProperties}")
 
-    SET(newProperties "${oldProps} /Yu\"${_inputh}\" /FI\"${_inputh}\"")
-    SET_TARGET_PROPERTIES(${_targetName} PROPERTIES COMPILE_FLAGS "${newProperties}")
+      #also inlude ${oldProps} to have the same compile options
+      SET_SOURCE_FILES_PROPERTIES(${_inputcpp} PROPERTIES COMPILE_FLAGS "${oldProps} /Yc\"${_inputh}\"")
+    ELSEIF(PCH_METHOD EQUAL 2)
+      # For Xcode, cmake needs my patch to process
+      # GCC_PREFIX_HEADER and GCC_PRECOMPILE_PREFIX_HEADER as target properties
 
-    #also inlude ${oldProps} to have the same compile options
-    SET_SOURCE_FILES_PROPERTIES(${_inputcpp} PROPERTIES COMPILE_FLAGS "${oldProps} /Yc\"${_inputh}\"")
-  ELSEIF(PCH_METHOD EQUAL 2)
-    # For Xcode, cmake needs my patch to process
-    # GCC_PREFIX_HEADER and GCC_PRECOMPILE_PREFIX_HEADER as target properties
+      # When buiding out of the tree, precompiled may not be located
+      # Use full path instead.
+      GET_FILENAME_COMPONENT(fullPath ${_inputh} ABSOLUTE)
 
-    # When buiding out of the tree, precompiled may not be located
-    # Use full path instead.
-    GET_FILENAME_COMPONENT(fullPath ${_inputh} ABSOLUTE)
+      SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${fullPath}")
+      SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
+    ELSE()
+      #Fallback to the "old" precompiled suppport
+      ADD_PRECOMPILED_HEADER(${_targetName} ${_inputh} ${_inputcpp})
+    ENDIF()
 
-    SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${fullPath}")
-    SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
+    IF(TARGET ${_targetName}_static)
+      ADD_NATIVE_PRECOMPILED_HEADER(${_targetName}_static ${_inputh} ${_inputcpp})
+    ENDIF()
   ELSE()
-    #Fallback to the "old" precompiled suppport
-    ADD_PRECOMPILED_HEADER(${_targetName} ${_inputh} ${_inputcpp})
-  ENDIF()
-
-  IF(TARGET ${_targetName}_static)
-    ADD_NATIVE_PRECOMPILED_HEADER(${_targetName}_static ${_inputh} ${_inputcpp})
+    MESSAGE(STATUS "PCH disabled because compiler doesn't support them")
   ENDIF()
 ENDMACRO()