Use CMake to build project

Signed-off-by: Charity Kathure <[email protected]>

Author: CharityKathure

LogMonitor/CMakeLists.txt

@@ -1,10 +1,24 @@
 cmake_minimum_required(VERSION 3.15)
+
+# Define the project
 project(LogMonitor)
 
-# Use C++17 standard
+# Set C++ standard
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-# Add src and tests directories
-add_subdirectory(src)
-add_subdirectory(LogMonitorTests)
+# Use vcpkg if available
+if (DEFINED ENV{VCPKG_ROOT})
+    set(VCPKG_ROOT $ENV{VCPKG_ROOT})
+    set(CMAKE_TOOLCHAIN_FILE "${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Toolchain file for vcpkg" FORCE)
+endif()
+
+# Enable testing framework
+enable_testing()
+
+# Enable Unicode globally
+add_definitions(-DUNICODE -D_UNICODE)
+
+# Include subdirectories for main and test executables
+add_subdirectory(src)  # Add main executable's CMake
+add_subdirectory(LogMonitorTests)  # Add test executable's CMake

LogMonitor/LogMonitorTests/CMakeLists.txt

@@ -1,31 +1,58 @@
 cmake_minimum_required(VERSION 3.15)
 
-# Find Boost
+project(LogMonitorTests)
+
 find_package(Boost REQUIRED)
 
-# Define test executable
-add_executable(LogMonitorTests
-    ConfigFileParserTests.cpp
+set(TEST_SOURCES
+    JsonProcessorTests.cpp
     EtwMonitorTests.cpp
     EventMonitorTests.cpp
     LogFileMonitorTests.cpp
     LogMonitorTests.cpp
     UtilityTests.cpp
     Utility.cpp
-    Utility.h
     pch.cpp
-    pch.h
+    ConfigFileParserTests.cpp
 )
 
-# Include directories
+# Ensure all source files exist before proceeding
+foreach(FILE ${TEST_SOURCES})
+    if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${FILE}")
+        message(WARNING "File not found: ${FILE}")
+        list(REMOVE_ITEM TEST_SOURCES ${FILE})
+    endif()
+endforeach()
+
+if(NOT TEST_SOURCES)
+    message(FATAL_ERROR "No valid source files found for LogMonitorTests.")
+endif()
+
+# Define test shared library (DLL)
+add_library(LogMonitorTests SHARED ${TEST_SOURCES})
+
+# Add a definition for symbol exporting
+target_compile_definitions(LogMonitorTests PRIVATE LOGMONITORTESTS_EXPORTS)
+
+# Include directories (for headers)
 target_include_directories(LogMonitorTests PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/../src/LogMonitor
+    ${CMAKE_CURRENT_SOURCE_DIR}  # Includes Utility.h and pch.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/../src
     ${Boost_INCLUDE_DIRS}
 )
 
+# Set Windows-specific linker flags
+set_target_properties(LogMonitorTests PROPERTIES
+    COMPILE_PDB_NAME "LogMonitorTests"
+    COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
+    LINK_FLAGS "/DEBUG:FULL /OPT:REF /OPT:ICF"
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
+)
+
 # Link with LogMonitor and Boost
 target_link_libraries(LogMonitorTests PRIVATE LogMonitor ${Boost_LIBRARIES})
 
-# Enable CTest
+# Enable testing
 enable_testing()
+
 add_test(NAME LogMonitorTests COMMAND LogMonitorTests)

LogMonitor/src/CMakeLists.txt

@@ -1,36 +1,30 @@
 cmake_minimum_required(VERSION 3.15)
 
-# Find Boost (ensure Boost is installed on your system)
+project(LogMonitor)
+
+# Find Boost (Boost is installed)
 find_package(Boost REQUIRED)
 
-# Define the executable
-add_executable(LogMonitor
+# Define LogMonitor as a library instead of an executable
+add_library(LogMonitor
     LogMonitor/Main.cpp
     LogMonitor/EtwMonitor.cpp
-    LogMonitor/EtwMonitor.h
     LogMonitor/EventMonitor.cpp
-    LogMonitor/EventMonitor.h
     LogMonitor/JsonFileParser.cpp
     LogMonitor/JsonProcessor.cpp
-    LogMonitor/JsonProcessor.h
     LogMonitor/LogFileMonitor.cpp
-    LogMonitor/LogFileMonitor.h
     LogMonitor/ProcessMonitor.cpp
-    LogMonitor/ProcessMonitor.h
     LogMonitor/Utility.cpp
-    LogMonitor/Utility.h
     LogMonitor/FileMonitor/FileMonitorUtilities.cpp
-    LogMonitor/FileMonitor/FileMonitorUtilities.h
     LogMonitor/pch.cpp
-    LogMonitor/pch.h
 )
 
-# Include directories
+# Include directories for LogMonitor
 target_include_directories(LogMonitor PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/LogMonitor
-    ${CMAKE_CURRENT_SOURCE_DIR}/LogMonitor/FileMonitor
-    ${Boost_INCLUDE_DIRS}  # Add Boost include directories
+	${CMAKE_CURRENT_SOURCE_DIR}/LogMonitor/FileMonitor
+    ${Boost_INCLUDE_DIRS}
 )
 
-# Link Boost
+# Link Boost libraries to LogMonitor
 target_link_libraries(LogMonitor PRIVATE ${Boost_LIBRARIES})