From c27ebb6c6413ce3a130b8d967c18744925ef567b Mon Sep 17 00:00:00 2001
From: Derek Christ <derek.christ@iese.fraunhofer.de>
Date: Wed, 30 Aug 2023 09:18:57 +0200
Subject: [PATCH] Fix gem5 integration issues

---
 CMakeLists.txt                 | 8 ++++++--
 configs/simconfig/gem5_se.json | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65649bde..a3bde281 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# Authors: 
+# Authors:
 #    Thomas Psota
 #    Lukas Steiner
 
@@ -133,7 +133,11 @@ FetchContent_Declare(
     FIND_PACKAGE_ARGS NAMES SystemCLanguage)
 
 set(DISABLE_COPYRIGHT_MESSAGE True)
-FetchContent_MakeAvailable(systemc)
+
+# Allow populating of a user-set SystemC package
+if (NOT TARGET SystemC::systemc)
+    FetchContent_MakeAvailable(systemc)
+endif()
 
 ### DRAMPower ###
 if (DRAMSYS_WITH_DRAMPOWER)
diff --git a/configs/simconfig/gem5_se.json b/configs/simconfig/gem5_se.json
index 36f846ee..9c3a48b8 100644
--- a/configs/simconfig/gem5_se.json
+++ b/configs/simconfig/gem5_se.json
@@ -5,7 +5,7 @@
         "DatabaseRecording": true,
         "Debug": false,
         "EnableWindowing": true,
-        "PowerAnalysis": true,
+        "PowerAnalysis": false,
         "SimulationName": "gem5_se",
         "SimulationProgressBar": true,
         "StoreMode": "Store",