From 92aafb144781a4e5aaa442697a29dd2016cf54c6 Mon Sep 17 00:00:00 2001
From: Jussi Lindgren <jussi.lindgren@inria.fr>
Date: Tue, 26 Apr 2016 12:03:39 +0200
Subject: [PATCH] Build: Fix for stim generation on Visual Studio
---
build-tool/stimulation-generator/CMakeLists.txt | 6 ------
plugins/processing/matlab/CMakeLists.txt | 2 +-
toolkit/CMakeLists.txt | 2 +-
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/build-tool/stimulation-generator/CMakeLists.txt b/build-tool/stimulation-generator/CMakeLists.txt
index cb69c8a498..20516a4afb 100644
--- a/build-tool/stimulation-generator/CMakeLists.txt
+++ b/build-tool/stimulation-generator/CMakeLists.txt
@@ -8,12 +8,6 @@ SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_
FILE(GLOB_RECURSE source_files src/*.cpp src/*.h src/*.inl)
ADD_EXECUTABLE(openvibe-stimulation-generator ${source_files})
-if(UNIX)
-SET(stim_generator_path "${CMAKE_CURRENT_BINARY_DIR}" CACHE INTERNAL "stim_generator_path")
-else()
-get_property(path_to_target TARGET openvibe-stimulation-generator PROPERTY LOCATION)
-SET(stim_generator_path "${path_to_target}" CACHE INTERNAL "stim_generator_path")
-endif()
# ---------------------------------
# Target macros
# Defines target operating system
diff --git a/plugins/processing/matlab/CMakeLists.txt b/plugins/processing/matlab/CMakeLists.txt
index 5eb283df6e..8982ee5f02 100644
--- a/plugins/processing/matlab/CMakeLists.txt
+++ b/plugins/processing/matlab/CMakeLists.txt
@@ -7,7 +7,7 @@ SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_
add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/share/OV_stimulations.m
DEPENDS openvibe-stimulation-generator ${openvibe-toolkit_SOURCE_DIR}/share/stimulation_list.txt
- COMMAND ${stim_generator_path}/openvibe-stimulation-generator
+ COMMAND openvibe-stimulation-generator
--matlab
${openvibe-toolkit_SOURCE_DIR}/share/stimulation_list.txt
${CMAKE_CURRENT_SOURCE_DIR}/share/OV_stimulations.m
diff --git a/toolkit/CMakeLists.txt b/toolkit/CMakeLists.txt
index fe2e0340dd..a2c74a91ff 100644
--- a/toolkit/CMakeLists.txt
+++ b/toolkit/CMakeLists.txt
@@ -10,7 +10,7 @@ SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_
#We need to generate the stimulation files
add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/include/toolkit/ovtk_stimulations.h ${CMAKE_CURRENT_SOURCE_DIR}/src/ovtk_stimulations.cpp
DEPENDS openvibe-stimulation-generator ${CMAKE_CURRENT_SOURCE_DIR}/share/stimulation_list.txt
- COMMAND ${stim_generator_path}/openvibe-stimulation-generator
+ COMMAND openvibe-stimulation-generator
--cpp
${CMAKE_CURRENT_SOURCE_DIR}/share/stimulation_list.txt
${CMAKE_CURRENT_SOURCE_DIR}/include/toolkit/ovtk_stimulations.h
--
GitLab