Merge pull request #7 from codingwithmagga/feature/CWM/2-configure-googletest-framework

Integrate GoogleTest + restructure library/CLI layout

Author: codingwithmagga

CMakeLists.txt

@@ -8,6 +8,7 @@ endif()
 
 option(CI "Enable CI build mode and treat warnings as errors" OFF)
 option(ENABLE_MARCH_NATIVE "Enable -march=native optimization" OFF)
+option(CPUSCOPE_BUILD_TESTS "Build tests" OFF)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -34,5 +35,21 @@ endif()
 find_package(Threads REQUIRED)
 find_package(LLVM QUIET)
 
-add_subdirectory(src)
-add_subdirectory(tests)
+if(CPUSCOPE_BUILD_TESTS)
+  include(CTest)
+  enable_testing()
+
+  include(FetchContent)
+  FetchContent_Declare(
+    googletest
+    GIT_REPOSITORY https://github.com/google/googletest.git
+    GIT_TAG v1.17.0
+  )
+  FetchContent_MakeAvailable(googletest)
+endif()
+
+add_subdirectory(lib)
+add_subdirectory(cli)
+if(CPUSCOPE_BUILD_TESTS)
+  add_subdirectory(tests)
+endif()

cli/CMakeLists.txt

@@ -0,0 +1,7 @@
+add_executable(cpuscope_cli main.cpp)
+
+target_link_libraries(cpuscope_cli PRIVATE cpuscope_lib)
+
+set_target_properties(cpuscope_cli PROPERTIES
+  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+)

src/main.cpp cli/main.cppsrc/main.cpp renamed to cli/main.cpp

@@ -4,11 +4,12 @@
 
 #include "cpuscope_lib.hpp"
 
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
 {
     std::vector<std::string_view> args;
     args.reserve(argc);
-    for (int i = 0; i < argc; ++i) {
+    for (int i = 0; i < argc; ++i)
+    {
         args.emplace_back(argv[i]);
     }
 

src/CMakeLists.txt lib/CMakeLists.txtsrc/CMakeLists.txt renamed to lib/CMakeLists.txt

@@ -1,9 +1,8 @@
 add_library(cpuscope_lib STATIC
-  cpuscope_lib.cpp
-  cpuscope_lib.hpp
+  src/cpuscope_lib.cpp
 )
 
-target_include_directories(cpuscope_lib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(cpuscope_lib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 target_link_libraries(cpuscope_lib PUBLIC Threads::Threads)
 
@@ -14,12 +13,4 @@ else()
   message(STATUS "LLVM not found; continuing without optional LLVM support.")
 endif()
 
-target_compile_features(cpuscope_lib PUBLIC cxx_std_20)
-
-add_executable(cpuscope_cli main.cpp)
-
-target_link_libraries(cpuscope_cli PRIVATE cpuscope_lib)
-
-set_target_properties(cpuscope_cli PROPERTIES
-  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
-)
+target_compile_features(cpuscope_lib PUBLIC cxx_std_20)

lib/include/cpuscope_lib.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <format>
+#include <span>
+#include <string>
+#include <string_view>
+#include <vector>
+
+namespace cpuscope
+{
+
+    inline std::string format_message(std::span<const std::string_view> args)
+    {
+        return std::format("CPUScope CLI placeholder: {} arguments received.", args.size());
+    }
+
+} // namespace cpuscope

lib/include/version.hpp

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <string>
+
+namespace cpuscope
+{
+
+    std::string get_version()
+    {
+        return "0.1.0";
+    }
+
+} // namespace cpuscope

lib/src/cpuscope_lib.cpp

@@ -0,0 +1,8 @@
+#include "cpuscope_lib.hpp"
+
+namespace cpuscope
+{
+
+    // Implementation is header-only for the initial placeholder functionality.
+
+} // namespace cpuscope

src/cpuscope_lib.cpp

@@ -1,9 +1,6 @@
-add_executable(cpuscope_tests test_main.cpp)
+add_executable(cpuscope_tests test_dummy.cpp)
 
-target_link_libraries(cpuscope_tests PRIVATE cpuscope_lib)
+target_link_libraries(cpuscope_tests PRIVATE gtest_main cpuscope_lib)
 
-set_target_properties(cpuscope_tests PROPERTIES
-  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
-)
-
-add_test(NAME cpuscope_tests COMMAND cpuscope_tests)
+include(GoogleTest)
+gtest_discover_tests(cpuscope_tests)