From d981b8a331b585610b06bfb0874f5a0a0d4f8ecb Mon Sep 17 00:00:00 2001 From: Matthias Jung Date: Tue, 1 Feb 2022 00:50:27 +0100 Subject: [PATCH 1/2] Added some lines for macOS support brew install qt@5 qwt-qt5 --- DRAMSys/traceAnalyzer/CMakeLists.txt | 8 +++++- utils/install_mac.sh | 37 ++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100755 utils/install_mac.sh diff --git a/DRAMSys/traceAnalyzer/CMakeLists.txt b/DRAMSys/traceAnalyzer/CMakeLists.txt index 28e71f52..1d413055 100644 --- a/DRAMSys/traceAnalyzer/CMakeLists.txt +++ b/DRAMSys/traceAnalyzer/CMakeLists.txt @@ -43,14 +43,20 @@ project(TraceAnalyzer) find_package(Python3 COMPONENTS Development) # Add QWT Dependency: -find_library(QWT_LIBRARY NAMES "qwt-qt5" "qwt" PATHS "$ENV{QWT_HOME}/lib") +find_library(QWT_LIBRARY NAMES "qwt-qt5" "qwt" PATHS + "$ENV{QWT_HOME}/lib" + "/opt/homebrew/opt/qwt-qt5/lib" +) find_path(QWT_INCLUDE_DIRS NAMES "qwt_plot.h" PATHS "/usr/include/qwt-qt5" "/usr/include/qwt" "$ENV{QWT_HOME}/include" + "/opt/homebrew/opt/qwt-qt5/include" + "/opt/homebrew/opt/qwt-qt5/lib/qwt.framework/Headers" ) # Add QT Library: +set(Qt5_DIR "/opt/homebrew/opt/qt@5/lib/cmake/Qt5") find_package(Qt5 COMPONENTS Core Gui Widgets Sql REQUIRED) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) diff --git a/utils/install_mac.sh b/utils/install_mac.sh new file mode 100755 index 00000000..5e59e0e5 --- /dev/null +++ b/utils/install_mac.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash + +# Copyright (c) 2018, University of Kaiserslautern +# 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 + +brew install qt@5 qwt-qt5 + +echo -e "Done." From 378a5d9608820bdcca6f7da247c1a1b1efb91d25 Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Tue, 1 Feb 2022 10:10:18 +0100 Subject: [PATCH 2/2] Set Qt5_DIR only on apple. --- DRAMSys/traceAnalyzer/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DRAMSys/traceAnalyzer/CMakeLists.txt b/DRAMSys/traceAnalyzer/CMakeLists.txt index 1d413055..09333b01 100644 --- a/DRAMSys/traceAnalyzer/CMakeLists.txt +++ b/DRAMSys/traceAnalyzer/CMakeLists.txt @@ -56,7 +56,9 @@ find_path(QWT_INCLUDE_DIRS NAMES "qwt_plot.h" PATHS ) # Add QT Library: -set(Qt5_DIR "/opt/homebrew/opt/qt@5/lib/cmake/Qt5") +if (APPLE) + set(Qt5_DIR "/opt/homebrew/opt/qt@5/lib/cmake/Qt5") +endif(APPLE) find_package(Qt5 COMPONENTS Core Gui Widgets Sql REQUIRED) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON)