Fix Dia Isuse & Some Build Fails

Author: wissem01chiha

CMake/Config.cmake.in

@@ -1,2 +1,2 @@
 @PACKAGE_INIT@
-include("${CMAKE_CURRENT_LIST_DIR}/vccovTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/vcovTargets.cmake")

CMake/FindDia.cmake

@@ -12,10 +12,15 @@
 #  Dia_FOUND              - True if the DIA library was found.
 #==========================================================================]
 
-find_path(Dia_INCLUDE_DIR dia2.h)
+# by default DIA directories are not addded to system envirment variables 
+# this need to be run from a developper command prompet
+find_path(Dia_INCLUDE_DIR
+    NAMES dia2.h
+    PATHS "$ENV{VSINSTALLDIR}/DIA SDK/include"
+    NO_DEFAULT_PATH
+)
 
 string(TOLOWER "${CMAKE_GENERATOR_PLATFORM}" _dia_platform)
-message(STATUS "Detected platform: ${_dia_platform}")
 
 if(_dia_platform STREQUAL "x64" OR _dia_platform STREQUAL "amd64")
     set(_DIA_LIB_PATHS ${Dia_INCLUDE_DIR}/../lib/amd64)
@@ -32,12 +37,10 @@ find_library(Dia_LIBRARY diaguids.lib
     NO_DEFAULT_PATH
 )
 
-message(STATUS "DIA architecture directories: ${_DIA_ARCH_DIRS}")
-
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Dia DEFAULT_MSG Dia_INCLUDE_DIR Dia_LIBRARY)
 
 if(Dia_FOUND)
   set(Dia_INCLUDE_DIRS ${Dia_INCLUDE_DIR})
   set(Dia_LIBRARIES ${Dia_LIBRARY})
-endif()
+endif()

CMake/FindVcov.cmake

@@ -1,9 +1,9 @@
 #[=======================================================================[.rst:
-# Findvcov
+# FindVcov
 # -----------
 # Find the Vcov library
 #
-#  find_package(vcov [<version>] REQUIRED)
+#  find_package(Vcov [<version>] REQUIRED)
 #
 #    - Vcov_FOUND        - True if the library was found.
 #    - Vcov_VERSION      - The version of the library.

Common/MiniDump.hpp

@@ -17,6 +17,7 @@
 #pragma once
 
 #include "CommonExport.h"
+#include <windows.h>
 #include <DbgHelp.h>
 
 namespace Tools

Console/OpenCppCoverage.hpp

@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
-
+#define NOMINMAX
 #include "ConsoleExport.h"
 #include <iosfwd>
 

Core/Debugger.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "CoreExport.h"
-#include <Windows.h>
+#include <windows.h>
 #include <boost/optional/optional.hpp>
 #include <unordered_map>
 

Core/Process.cpp

@@ -20,7 +20,7 @@
 #include "StartInfo.hpp"
 #include "Tool.hpp"
 #include "stdafx.h"
-#include <Windows.h>
+#include <windows.h>
 #include <boost/optional.hpp>
 #include <vector>
 

Filter/LineInfo.hpp

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <minwindef.h>
+#include <windows.h>
 #include <vector>
 
 namespace FileFilter

Filter/ReleaseCoverageFilter.hpp

@@ -19,7 +19,7 @@
 #include "FilterExport.h"
 #include <filesystem>
 #include <memory>
-#include <minwindef.h>
+#include <windows.h>
 #include <unordered_map>
 #include <unordered_set>