From 37d2eafe17cbf6c0e5bbb1d6cc588eb08d7c6a3e Mon Sep 17 00:00:00 2001
From: mzed <github@mikezed.com>
Date: Mon, 27 Nov 2017 13:49:50 +0000
Subject: [PATCH] properly linking accelerate to rapidmix. fixing wornings
---
CMakeLists.txt | 3 ++-
src/machineLearning/trainingData.cpp | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b271fcc..24b0ac0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,8 @@ if (APPLE)
if (NOT ACCELERATE)
message(FATAL_ERROR "Accelearate not found")
endif()
- target_link_libraries(rapidmixTest RAPID-MIX_API ${ACCELERATE})
+ target_link_libraries(RAPID-MIX_API ${ACCELERATE})
+ target_link_libraries(rapidmixTest RAPID-MIX_API)
else()
target_link_libraries(rapidmixTest RAPID-MIX_API)
endif()
diff --git a/src/machineLearning/trainingData.cpp b/src/machineLearning/trainingData.cpp
index ba209e7..f81d11f 100644
--- a/src/machineLearning/trainingData.cpp
+++ b/src/machineLearning/trainingData.cpp
@@ -47,7 +47,7 @@ namespace rapidmix {
newElement.uniqueId = assignCurrentId();
newElement.input = input;
newElement.output = output;
- newElement.timeStamp = NULL;
+ newElement.timeStamp = 0.0;
trainingSet[targetPhrase].elements.push_back(newElement);
return newElement.uniqueId;
}
@@ -56,7 +56,7 @@ namespace rapidmix {
element newElement;
newElement.uniqueId = assignCurrentId();
newElement.input = input;
- newElement.timeStamp = NULL;
+ newElement.timeStamp = 0.0;
trainingSet[targetPhrase].elements.push_back(newElement);
return newElement.uniqueId;
}
--
GitLab