From fd45d2c38b0d2c8f08faa2be8252ef974971ffa9 Mon Sep 17 00:00:00 2001 From: Pierre Alexandre Tremblay Date: Wed, 11 Jul 2018 18:03:33 +0100 Subject: [PATCH] modified the Cmake to allow for stft.h linking --- CMakeLists.txt | 25 +++++++++++++++++++++++-- fdNMF.cpp | 2 +- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 43d07ff..ad09a29 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,16 @@ +####### added the eingenmf +set(EIGENMF_DIR ../eigenmf) + +include_directories( + "${EIGENMF_DIR}" + "${EIGENMF_DIR}/Eigen" + "${EIGENMF_DIR}/HISSTools_FFT" +) + +####### original SC Cmake file starts here set(FILENAME "fdNMF.cpp") #specify the .cpp file here cmake_minimum_required (VERSION 2.8) get_filename_component(PROJECT ${FILENAME} NAME_WE) #automatically sets project name from the filename -# set(PROJECT "my_name") #alternatively set project name manually message(STATUS "Project name is ${PROJECT}") project (${PROJECT}) @@ -81,9 +90,21 @@ if(MINGW) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mstackrealign") endif() -add_library(${PROJECT} MODULE ${FILENAME}) +####### added the eingenmf +add_library( +${PROJECT} +MODULE +${FILENAME} +"${EIGENMF_DIR}/nmf.cc" +"${EIGENMF_DIR}/nmf.h" +"${EIGENMF_DIR}/stft.cc" +"${EIGENMF_DIR}/stft.h" + "${EIGENMF_DIR}/HISSTools_FFT/HISSTools_FFT.cpp" +) if(SUPERNOVA) add_library(${PROJECT}_supernova MODULE ${FILENAME}) set_property(TARGET ${PROJECT}_supernova PROPERTY COMPILE_DEFINITIONS SUPERNOVA) endif() + +target_link_libraries (${PROJECT} "-framework Accelerate") diff --git a/fdNMF.cpp b/fdNMF.cpp index 69ac7ba..81ebe0c 100644 --- a/fdNMF.cpp +++ b/fdNMF.cpp @@ -3,7 +3,7 @@ #include "SC_PlugIn.h" #include -// #include "stft.h" +#include "stft.h" static InterfaceTable *ft;