From aeb814932f1338dbf7cd941a1bf94b8ce26342e4 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sun, 25 Oct 2015 15:17:26 +0100
Subject: [PATCH] Merge with develop

---
 code/CMakeModules/PCHSupport.cmake | 4 ++--
 code/CMakeModules/nel.cmake        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/CMakeModules/PCHSupport.cmake b/code/CMakeModules/PCHSupport.cmake
index c81e88a5d..005d430d2 100644
--- a/code/CMakeModules/PCHSupport.cmake
+++ b/code/CMakeModules/PCHSupport.cmake
@@ -16,9 +16,9 @@ ELSE()
       ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
       OUTPUT_VARIABLE gcc_compiler_version)
 
-    IF(gcc_compiler_version MATCHES "^4\\.1(\\.[0-9]+)?")
+    IF(gcc_compiler_version VERSION_LESS "4.2")
       SET(PCHSupport_FOUND FALSE)
-    ELSEIF(gcc_compiler_version MATCHES "^4\\.[0-9]+(\\.[0-9]+)?")
+    ELSE()
       SET(PCHSupport_FOUND TRUE)
     ENDIF()
   ELSE()
diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index 52ee640e9..a4561c677 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -102,10 +102,10 @@ ENDMACRO(NL_TARGET_DRIVER)
 # Argument:
 ###
 MACRO(NL_DEFAULT_PROPS name label)
-  IF(HAVE_REVISION_H)
+  IF(TARGET revision)
     # explicitly say that the target depends on revision.h
     ADD_DEPENDENCIES(${name} revision)
-  ENDIF(HAVE_REVISION_H)
+  ENDIF()
 
   # Note: This is just a workaround for a CMake bug generating VS10 files with a colon in the project name.
   # CMake Bug ID: http://www.cmake.org/Bug/view.php?id=11819