Remove file globs from CMakeLists

Fix build

CMakeLists.txt

@@ -51,7 +51,6 @@ message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
 
 ### CMake settings ###
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
-include(build_source_group)
 include(diagnostics_print)
 include(enable_extensions)
 include(FetchContent)
@@ -107,7 +106,8 @@ option(DRAMSYS_USE_EXTERNAL_SYSTEMC "Use an external SystemC installation." OFF)
 find_package(Threads)
 
 ### nlohmann_json ###
-add_subdirectory(${DRAMSYS_LIBRARY_DIR}/nlohmann_json)
+FetchContent_Declare(nlohmann_json URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz)
+FetchContent_MakeAvailable(nlohmann_json)
 
 ### sqlite3 ###
 add_subdirectory(${DRAMSYS_LIBRARY_DIR}/sqlite3)
@@ -159,10 +159,6 @@ if (NOT TARGET SystemC::systemc)
 
     # Set include directories to SYSTEM to suppress warnings
     set_target_properties(systemc PROPERTIES SYSTEM TRUE)
-else()
-    # TODO: Fix gem5 build (see Issue 57)
-    # Set include directories to SYSTEM to suppress warnings
-    # set_target_properties(SystemC::systemc PROPERTIES SYSTEM TRUE)
 endif()
 
 
@@ -181,7 +177,6 @@ endif ()
 ###           Source Directory              ###
 ###############################################
 
-add_subdirectory(src/util)
 add_subdirectory(src/configuration)
 add_subdirectory(src/libdramsys)