From 6418d2c232ca2c31cc460588f5e9b5be969d241b Mon Sep 17 00:00:00 2001
From: Lukas Steiner <lsteiner@rhrk.uni-kl.de>
Date: Tue, 21 Apr 2020 17:36:28 +0200
Subject: [PATCH] Separate cmake file for simulator to use old paths.

---
 DRAMSys/CMakeLists.txt               | 12 ++------
 DRAMSys/library/CMakeLists.txt       |  2 +-
 DRAMSys/simulator/CMakeLists.txt     | 46 ++++++++++++++++++++++++++++
 DRAMSys/simulator/main.cpp           |  4 +--
 DRAMSys/traceAnalyzer/CMakeLists.txt |  4 +--
 5 files changed, 54 insertions(+), 14 deletions(-)
 create mode 100644 DRAMSys/simulator/CMakeLists.txt

diff --git a/DRAMSys/CMakeLists.txt b/DRAMSys/CMakeLists.txt
index 6de513dd..48511ed2 100644
--- a/DRAMSys/CMakeLists.txt
+++ b/DRAMSys/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # Author: Matthias Jung
 
-cmake_minimum_required(VERSION 3.6)
+cmake_minimum_required(VERSION 3.10)
 
 # Project Name:
 project(DRAMSys)
@@ -50,11 +50,5 @@ add_subdirectory(library)
 # Add TraceAnalyzer:
 add_subdirectory(traceAnalyzer)
 
-# Build:
-add_executable(DRAMSys simulator/main.cpp)
-target_include_directories(DRAMSys
-    PUBLIC library/src/simulation/
-    PUBLIC library/src/common/third_party/sqlite-amalgamation/
-)
-target_link_libraries(DRAMSys sqlite3::sqlite3 systemc DRAMSysLibrary)
-
+# Add DRAMSysSimulator:
+add_subdirectory(simulator)
diff --git a/DRAMSys/library/CMakeLists.txt b/DRAMSys/library/CMakeLists.txt
index 94f6bfb8..0bfbbd1e 100644
--- a/DRAMSys/library/CMakeLists.txt
+++ b/DRAMSys/library/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # Author: Matthias Jung
 
-cmake_minimum_required(VERSION 3.6)
+cmake_minimum_required(VERSION 3.10)
 
 # Project Name
 project(DRAMSysLibrary)
diff --git a/DRAMSys/simulator/CMakeLists.txt b/DRAMSys/simulator/CMakeLists.txt
new file mode 100644
index 00000000..abe50b28
--- /dev/null
+++ b/DRAMSys/simulator/CMakeLists.txt
@@ -0,0 +1,46 @@
+# Copyright (c) 2020, Fraunhofer IESE
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+#    contributors may be used to endorse or promote products derived from
+#    this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
+# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Author: Matthias Jung
+
+cmake_minimum_required(VERSION 3.10)
+
+# Project Name
+project(DRAMSysSimulator)
+
+# Configuration:
+set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ Version")
+set(DCMAKE_SH="CMAKE_SH-NOTFOUND")
+
+add_executable(DRAMSys main.cpp)
+target_include_directories(DRAMSys
+    PUBLIC ../library/src/simulation/
+)
+target_link_libraries(DRAMSys systemc DRAMSysLibrary)
diff --git a/DRAMSys/simulator/main.cpp b/DRAMSys/simulator/main.cpp
index cf231c5f..93d5fd6d 100644
--- a/DRAMSys/simulator/main.cpp
+++ b/DRAMSys/simulator/main.cpp
@@ -66,14 +66,14 @@ int sc_main(int argc, char **argv)
     if (argc == 1) {
         // Get path of resources:
         resources = pathOfFile(argv[0])
-                    + std::string("/../DRAMSys/library/resources/");
+                    + std::string("/../../DRAMSys/library/resources/");
         SimulationXML = resources + "simulations/ddr3-example.xml";
     }
     // Run with specific config but default resource folders:
     else if (argc == 2) {
         // Get path of resources:
         resources = pathOfFile(argv[0])
-                    + std::string("/../DRAMSys/library/resources/");
+                    + std::string("/../../DRAMSys/library/resources/");
         SimulationXML = argv[1];
     }
     // Run with spefific config and specific resource folder:
diff --git a/DRAMSys/traceAnalyzer/CMakeLists.txt b/DRAMSys/traceAnalyzer/CMakeLists.txt
index 4a4eb37a..00b38a9a 100644
--- a/DRAMSys/traceAnalyzer/CMakeLists.txt
+++ b/DRAMSys/traceAnalyzer/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # Author: Matthias Jung
 
-cmake_minimum_required(VERSION 3.6)
+cmake_minimum_required(VERSION 3.10)
 
 # Project Name:
 project(TraceAnalyzer)
@@ -59,7 +59,7 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 # Configure:
-set (CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 11)
 set(DCMAKE_SH="CMAKE_SH-NOTFOUND")
 
 include_directories(