From 16abbb6b2dae3db7aebdcc5ed918c3ed7cf5ee06 Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Mon, 27 Apr 2020 11:39:44 +0200 Subject: [PATCH] Fixed Python3 dependency for Trace Analyzer. --- DRAMSys/traceAnalyzer/CMakeLists.txt | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/DRAMSys/traceAnalyzer/CMakeLists.txt b/DRAMSys/traceAnalyzer/CMakeLists.txt index 00b38a9a..ef03cc71 100644 --- a/DRAMSys/traceAnalyzer/CMakeLists.txt +++ b/DRAMSys/traceAnalyzer/CMakeLists.txt @@ -35,20 +35,18 @@ cmake_minimum_required(VERSION 3.10) # Project Name: project(TraceAnalyzer) -# Add Python Dependency: -find_library(PYTHON3_LIBRARY NAMES Python3) - -# Add sqlite3 Dependency: -find_package(PythonLibs REQUIRED) +# Add Python3 Dependency: +find_package(Python3 COMPONENTS Development) # Add QWT Dependency: -find_library(QWT_LIBRARY NAMES "qwt-qt5" "qwt") -find_path (QWT_INCLUDE_DIRS NAMES "qwt_plot.h" PATHS +find_library(QWT_LIBRARY NAMES "qwt-qt5" "qwt" PATHS $ENV{LIBQWT_HOME}) +find_path(QWT_INCLUDE_DIRS NAMES "qwt_plot.h" PATHS "/usr/include/qwt-qt5" "/usr/include/qwt" "C:\\Qwt\\" "C:\\Qwt-6.1.4\\" "C:\\Users\\jung\\Zeugs\\qwt\\qwt-614-install\\include" + $ENV{LIBQWT_HEADERS} ) # Add QT Library: @@ -64,7 +62,7 @@ set(DCMAKE_SH="CMAKE_SH-NOTFOUND") include_directories( ${QWT_INCLUDE_DIRS} - ${PYTHON_INCLUDE_DIRS} + ${Python3_INCLUDE_DIRS} ./ businessObjects/ businessObjects/phases/ @@ -115,7 +113,7 @@ add_executable(TraceAnalyzer # Build: target_link_libraries(TraceAnalyzer - ${PYTHON_LIBRARIES} + ${Python3_LIBRARIES} ${QWT_LIBRARY} ) qt5_use_modules(TraceAnalyzer Widgets Sql)