From 7faccaa02bdff87a67ea03c65176e9ba022bdb32 Mon Sep 17 00:00:00 2001
From: Matthias Jung <matthias.jung@iese.fraunhofer.de>
Date: Wed, 26 Feb 2020 14:44:59 +0100
Subject: [PATCH] Included SystemC in CMAKE Build process

---
 DRAMSys/CMakeLists.txt               | 11 +++++------
 DRAMSys/library/CMakeLists.txt       | 15 ++++++++++-----
 DRAMSys/traceAnalyzer/CMakeLists.txt | 13 ++++---------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/DRAMSys/CMakeLists.txt b/DRAMSys/CMakeLists.txt
index 3212c071..8fb9b18d 100644
--- a/DRAMSys/CMakeLists.txt
+++ b/DRAMSys/CMakeLists.txt
@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.10)
 
-# Project Name
+# Project Name:
 project(DRAMSys)
 
-# Add SystemC Dependency:
-find_package(SystemCLanguage CONFIG REQUIRED PATHS "/opt/systemc/lib/cmake")
+# Configuration:
+set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ Version")
 
 # Add sqlite3 Dependency:
 find_library(SQLITE3_LIBRARY NAMES sqlite3)
@@ -15,9 +15,8 @@ add_subdirectory(library)
 # Add TraceAnalyzer:
 add_subdirectory(traceAnalyzer)
 
-set (CMAKE_CXX_STANDARD 11)
-
+# Build:
 add_executable(DRAMSys simulator/main.cpp)
 target_include_directories(DRAMSys PUBLIC DRAMSysLibrary library/src/simulation)
-target_link_libraries(DRAMSys SystemC::systemc sqlite3 DRAMSysLibrary)
+target_link_libraries(DRAMSys systemc sqlite3 DRAMSysLibrary)
 
diff --git a/DRAMSys/library/CMakeLists.txt b/DRAMSys/library/CMakeLists.txt
index ff924707..dc1e62f2 100644
--- a/DRAMSys/library/CMakeLists.txt
+++ b/DRAMSys/library/CMakeLists.txt
@@ -3,13 +3,17 @@ cmake_minimum_required(VERSION 3.10)
 # Project Name
 project(DRAMSysLibrary)
 
-# Add SystemC Dependency:
-find_package(SystemCLanguage CONFIG REQUIRED PATHS "/opt/systemc/lib/cmake")
-
-set (CMAKE_CXX_STANDARD 11)
+#set (CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ Version")
 
+# Add DRAMPower:
 add_subdirectory(src/common/third_party/DRAMPower)
 
+# Add SystemC:
+set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build Shared Libs")
+add_subdirectory(src/common/third_party/systemc)
+
+# Configuration:
 include_directories(
 	src/simulation
 	src/simulation/dram
@@ -97,6 +101,7 @@ add_library(DRAMSysLibrary
 	src/controller/powerdown/PowerDownManagerDummy.cpp
 )
 
+# Build:
 target_include_directories(DRAMSysLibrary PUBLIC src/common/third_party/DRAMPower/src)
-target_link_libraries(DRAMSysLibrary DRAMPower SystemC::systemc)
+target_link_libraries(DRAMSysLibrary SystemC::systemc DRAMPower)
 
diff --git a/DRAMSys/traceAnalyzer/CMakeLists.txt b/DRAMSys/traceAnalyzer/CMakeLists.txt
index f489ad94..7ec09045 100644
--- a/DRAMSys/traceAnalyzer/CMakeLists.txt
+++ b/DRAMSys/traceAnalyzer/CMakeLists.txt
@@ -1,11 +1,8 @@
 cmake_minimum_required(VERSION 3.10)
 
-# Project Name
+# Project Name:
 project(TraceAnalyzer)
 
-# Add SystemC Dependency:
-find_package(SystemCLanguage CONFIG REQUIRED PATHS "/opt/systemc/lib/cmake")
-
 # Add Python Dependency:
 find_library(PYTHON3_LIBRARY NAMES Python3)
 
@@ -16,15 +13,14 @@ find_package(PythonLibs REQUIRED)
 find_library(QWT_LIBRARY NAMES "qwt-qt5" "qwt")
 find_path (QWT_INCLUDE_DIRS NAMES "qwt_plot.h" PATHS "/usr/include/qwt-qt5" "/usr/include/qwt")
 
-message(${QWT_LIBRARY})
-
-# Add QT Library
+# Add QT Library:
 find_package(Qt5 COMPONENTS Core Gui Widgets Sql REQUIRED)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
+# Configure:
 set (CMAKE_CXX_STANDARD 11)
 
 include_directories(
@@ -71,10 +67,9 @@ add_executable(TraceAnalyzer
 	businessObjects/phases/phase.cpp
 )
 
-#target_include_directories(TraceAnalyzer PUBLIC qwt-qt5)
+# Build:
 target_link_libraries(TraceAnalyzer
 	${PYTHON_LIBRARIES}
 	${QWT_LIBRARY}
 )
 qt5_use_modules(TraceAnalyzer Widgets Sql)
-