Merge remote-tracking branch 'eit-wehn/master'

2017-03-30 21:10:49 +02:00
parent ebdcbb98e6 ead929d3da
commit cf0a7e0a79
1 changed files with 7 additions and 9 deletions
--- a/DRAMSys/DRAMSys.pro
+++ b/DRAMSys/DRAMSys.pro
@@ -1,8 +1,7 @@
 TEMPLATE = subdirs

 thermalsim = $$(THERMALSIM)
-isEmpty(thermalsim)
-{
+isEmpty(thermalsim) {
    thermalsim = false
 }

@@ -19,14 +18,13 @@ SUBDIRS += analyzer/traceAnalyzer.pro

 # Check if gem5 is installed:
 gem5 = $$(GEM5)
-isEmpty(gem5)
-{
-    DEFINES += DRAMSYS_GEM5
-}
-
-contains(DEFINES,DRAMSYS_GEM5)
-{
+isEmpty(gem5) {
+    message(GEM5 environment variable not found)
+    message(Gem5 Simulation Disabled)
+} else {
    message(Gem5 Simulation Feature Enabled)
+    message(Gem5 home is $${gem5})
+    DEFINES += DRAMSYS_GEM5
    SUBDIRS += gem5/gem5.pro
 }