From 59207c6a8d36b214cb1797bce137166e17fe251e Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Fri, 8 May 2020 11:35:09 +0200 Subject: [PATCH] Changed path of DRAMSys library for PCT. --- DRAMSys/library/CMakeLists.txt | 4 ++-- DRAMSys/pct/buildDRAMSys.sh | 9 --------- DRAMSys/pct/createPlatform.tcl | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) delete mode 100755 DRAMSys/pct/buildDRAMSys.sh diff --git a/DRAMSys/library/CMakeLists.txt b/DRAMSys/library/CMakeLists.txt index bca9472a..7966b995 100644 --- a/DRAMSys/library/CMakeLists.txt +++ b/DRAMSys/library/CMakeLists.txt @@ -51,9 +51,9 @@ add_subdirectory(src/common/third_party/DRAMPower) if(DEFINED ENV{SYSTEMC_HOME}) find_library(SYSTEMC_LIBRARY NAMES systemc SnpsVP - PATHS $ENV{SYSTEMC_HOME}/lib-$ENV{SYSTEMC_TARGET_ARCH}/ $ENV{SYSTEMC_HOME}/lib-linux64/ $ENV{SYSTEMC_HOME}/libso-gcc-5.2.0-64/ + PATHS $ENV{SYSTEMC_HOME}/lib-$ENV{SYSTEMC_TARGET_ARCH}/ $ENV{SYSTEMC_HOME}/lib-linux64/ $ENV{SYSTEMC_HOME}/libso-$ENV{COWARE_CXX_COMPILER}/ ) - message("Building with external SystemC") + message("Building with external SystemC located in $ENV{SYSTEMC_HOME}") else() set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build Shared Libs") add_subdirectory(src/common/third_party/systemc) diff --git a/DRAMSys/pct/buildDRAMSys.sh b/DRAMSys/pct/buildDRAMSys.sh deleted file mode 100755 index 7b578cc9..00000000 --- a/DRAMSys/pct/buildDRAMSys.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -JOBS=$(nproc --all) - -rm -rf lib -mkdir lib -cd lib -DRAMSYS_PCT=true qmake ../../simulator/library.pro -DRAMSYS_PCT=true make -j$JOBS diff --git a/DRAMSys/pct/createPlatform.tcl b/DRAMSys/pct/createPlatform.tcl index ead365f8..d6a1c661 100644 --- a/DRAMSys/pct/createPlatform.tcl +++ b/DRAMSys/pct/createPlatform.tcl @@ -48,7 +48,7 @@ # Add DRAMSys Library // ../[glob -type d ../../build*]/simulator/ ::pct::set_simulation_build_project_setting Debug Libraries "sqlite3 DRAMSysLibrary DRAMPower" -::pct::set_simulation_build_project_setting Debug {Library Search Paths} [concat ../../../build/ ../../../build/src/common/third_party/DRAMPower] +::pct::set_simulation_build_project_setting Debug {Library Search Paths} [concat ../../../build/library/ ../../../build/library/src/common/third_party/DRAMPower] ::pct::set_simulation_build_project_setting Debug {Defined Symbols} SC_INCLUDE_DYNAMIC_PROCESSES=1 ::pct::set_simulation_build_project_setting Debug {Compiler Flags} {-std=c++11}