Merge commit 'ace8b6e9'

* commit 'ace8b6e9':
  Code coverage with lcov module.
  This is version 5.2.07 by LB / TF / KR.
  Squashed commit of the following:

Conflicts:
	FindMSVCRedist.cmake
	OptionRequires.cmake

CodeCoverage.cmake

+# - Enable Code Coverage
+#
+# 2012-01-31, Lars Bilke
+#
+# USAGE:
+# 1. Copy this file into your cmake modules path
+# 2. Add the following line to your CMakeLists.txt:
+#      INCLUDE(CodeCoverage)
+# 
+# 3. Use the function SETUP_TARGET_FOR_COVERAGE to create a custom make target
+#    which runs your test executable and produces a lcov code coverage report.
+#
+
+# Check prereqs
+FIND_PROGRAM( GCOV_PATH gcov )
+FIND_PROGRAM( LCOV_PATH lcov )
+FIND_PROGRAM( GENHTML_PATH genhtml )
+
+IF(NOT GCOV_PATH)
+	MESSAGE(FATAL_ERROR "gcov not found! Aborting...")
+ENDIF() # NOT GCOV_PATH
+
+IF(NOT LCOV_PATH)
+	MESSAGE(FATAL_ERROR "lcov not found! Aborting...")
+ENDIF() # NOT LCOV_PATH
+
+IF(NOT GENHTML_PATH)
+	MESSAGE(FATAL_ERROR "genhtml not found! Aborting...")
+ENDIF() # NOT GENHTML_PATH
+
+IF(NOT CMAKE_COMPILER_IS_GNUCXX)
+	MESSAGE(FATAL_ERROR "Compiler is not GNU gcc! Aborting...")
+ENDIF() # NOT CMAKE_COMPILER_IS_GNUCXX
+
+IF ( NOT CMAKE_BUILD_TYPE STREQUAL "Debug" )
+  MESSAGE( WARNING "Code coverage results with an optimised (non-Debug) build may be misleading" )
+ENDIF() # NOT CMAKE_BUILD_TYPE STREQUAL "Debug"
+
+
+# Setup compiler options
+ADD_DEFINITIONS(-fprofile-arcs -ftest-coverage)
+LINK_LIBRARIES(gcov)
+
+
+# Param _targetname     The name of new the custom make target
+# Param _testrunnerexe  The executable name which runs the tests
+# Param _outputname     lcov output is generated as _outputname.info
+#                       HTML report is generated in _outputname/index.html
+FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _testrunnerexe _outputname)
+
+	# Setup target
+	ADD_CUSTOM_TARGET(${_targetname}
+		
+		# Cleanup lcov
+		lcov --directory . --zerocounters
+		
+		# Run tests
+		COMMAND ${_testrunnerexe}
+		
+		# Capturing lcov counters and generating report
+		COMMAND lcov --directory . --capture --output-file ${_outputname}.info
+		COMMAND lcov --remove ${_outputname}.info 'tests/*' '/usr/*' --output-file ${_outputname}.info.cleaned
+		COMMAND genhtml -o ${_outputname} ${_outputname}.info.cleaned
+		COMMAND ${CMAKE_COMMAND} -E remove ${_outputname}.info ${_outputname}.info.cleaned
+		
+		DEPENDS ${_testrunnerexe}
+		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+		COMMENT "Resetting code coverage counters to zero.\n
+			Processing code coverage counters and generating report."
+	)
+	
+	# Show info where to find the report
+	ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
+		COMMAND ;
+		COMMENT "Open ./${_outputname}/index.html in your browser to view the coverage report."
+	)
+
+ENDFUNCTION() # SETUP_TARGET_FOR_COVERAGE

FindMSVCRedist.cmake

@@ -5,6 +5,9 @@ IF (MSVC)
   if (MSVC90)
     set(VCVERS 9)
   endif()
+  if (MSVC10)
+	set(VCVERS 10)
+  endif()
   
   IF(CMAKE_CL_64)
     #IF(MSVC_VERSION GREATER 1599)
@@ -23,19 +26,23 @@ IF (MSVC)
     set(SDKVERS "2.0")
   endif()
   if(${VCVERS} EQUAL 9)
-    set(SDKVERS "3.5")
+    set(SDKVERS "v6.0A")
+  endif()
+  if(${VCVERS} EQUAL 10)
+    set(SDKVERS "v7.0A")
   endif()
-  IF(MSVC${VCVERS}0)
+  IF(MSVC${VCVERS}0 OR MSVC${VCVERS})
     FIND_PROGRAM(MSVC_REDIST NAMES
 vcredist_${CMAKE_MSVC_ARCH}/vcredist_${CMAKE_MSVC_ARCH}.exe
       PATHS
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\${VCVERS}.0;InstallDir]/../../SDK/v${SDKVERS}/BootStrapper/Packages/"
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${VCVERS}.0;InstallDir]/../../SDK/v${SDKVERS}/BootStrapper/Packages/"
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\VisualStudio\\${VCVERS}.0;InstallDir]/../../SDK/v${SDKVERS}/BootStrapper/Packages/"
+"C:/Program Files (x86)/Microsoft SDKs/Windows/${SDKVERS}/Bootstrapper/Packages/"
       )
     GET_FILENAME_COMPONENT(vcredist_name "${MSVC_REDIST}" NAME)
     INSTALL(PROGRAMS ${MSVC_REDIST} COMPONENT msvc_redist DESTINATION bin)
     SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\bin\\\\${vcredist_name}\\\"'")
     message(STATUS "MSVC_REDIST: ${MSVC_REDIST}")
-  ENDIF(MSVC${VCVERS}0)
+  ENDIF(MSVC${VCVERS}0 OR MSVC${VCVERS})
 ENDIF ()
\ No newline at end of file

OptionRequires.cmake

@@ -15,7 +15,7 @@
 function(option_requires name desc)
 	set(args ${ARGN})
 
-	set(OFF_BY_DEFAULT false)
+	set(OFF_BY_DEFAULT true)
 	list(FIND args "OFF_BY_DEFAULT" _off_found)
 	if(NOT _off_found EQUAL -1)
 		list(REMOVE_AT args ${_off_found})