Last active
November 2, 2015 10:53
-
-
Save FlorianFranzen/46a604abccbd703cb463 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git src/process_removeartefacts/process_removeartefacts.cpp src/process_removeartefacts/process_removeartefacts.cpp | |
index 13458f7..37bf8bc 100644 | |
--- src/process_removeartefacts/process_removeartefacts.cpp | |
+++ src/process_removeartefacts/process_removeartefacts.cpp | |
@@ -34,7 +34,7 @@ | |
using namespace std; | |
-main(int argc,char *argv[]) | |
+int main(int argc,char *argv[]) | |
{ | |
int nClusters,clusterID,time; | |
int feature[1000]; | |
diff --git CMakeLists.txt CMakeLists.txt | |
index f6b48d6..d19a6df 100644 | |
--- CMakeLists.txt | |
+++ CMakeLists.txt | |
@@ -5,7 +5,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR TRUE) | |
add_subdirectory(scripts) | |
add_subdirectory(descriptions) | |
add_subdirectory(src) | |
-add_subdirectory(python) | |
+if(UNIX AND NOT APPLE) | |
+ # Python tools currently disabled on OS X due to KDE4 dependency | |
+ add_subdirectory(python) | |
+endif() | |
add_subdirectory(matlab) | |
# Set package information | |
diff --git src/CMakeLists.txt src/CMakeLists.txt | |
index a36fd77..002913f 100644 | |
--- src/CMakeLists.txt | |
+++ src/CMakeLists.txt | |
@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 2.8.6) | |
add_subdirectory(process) | |
add_subdirectory(process_extractchannels) | |
-add_subdirectory(process_extractleds) | |
add_subdirectory(process_extractspikes) | |
add_subdirectory(process_medianfilter) | |
add_subdirectory(process_medianthreshold) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment