Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
The Openvibe Group
extras
Commits
b8c02436
Commit
b8c02436
authored
May 10, 2016
by
Jussi Lindgren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Build: Various tweaks
- Especially made the Ogre finding on Linux less selective
parent
945693d3
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
8 additions
and
60 deletions
+8
-60
CMakeLists.txt
CMakeLists.txt
+0
-3
cmake-modules/FindThirdPartyEmotivAPI.cmake
cmake-modules/FindThirdPartyEmotivAPI.cmake
+1
-1
cmake-modules/FindThirdPartyGMobiLabPlusAPI.cmake
cmake-modules/FindThirdPartyGMobiLabPlusAPI.cmake
+1
-1
cmake-modules/FindThirdPartyGUSBampCAPI.cmake
cmake-modules/FindThirdPartyGUSBampCAPI.cmake
+3
-3
cmake-modules/FindThirdPartyOgre3D.cmake
cmake-modules/FindThirdPartyOgre3D.cmake
+1
-1
cmake-modules/FindThirdPartyThinkGearAPI.cmake
cmake-modules/FindThirdPartyThinkGearAPI.cmake
+1
-1
contrib/plugins/processing/classification/CMakeLists.txt
contrib/plugins/processing/classification/CMakeLists.txt
+1
-50
No files found.
CMakeLists.txt
View file @
b8c02436
...
...
@@ -173,9 +173,6 @@ IF(UNIX)
SET
(
SKIP_PLUGINS_PROCESSING_MATLAB
"1"
)
ENDIF
(
UNIX
)
# Currently empty module
SET
(
SKIP_CONTRIB_PLUGINS_PROCESSING_CLASSIFICATION
"1"
)
#SET(SKIP_MODULES_AUTOMATON "1")
#SET(SKIP_MODULES_EBML "1")
#SET(SKIP_MODULES_FS "1")
...
...
cmake-modules/FindThirdPartyEmotivAPI.cmake
View file @
b8c02436
...
...
@@ -43,5 +43,5 @@ ELSE(LIB_EmotivAPI)
ENDIF
(
LIB_EmotivAPI
)
ELSE
(
PATH_EmotivAPI
)
MESSAGE
(
STATUS
" FAILED to find Emotiv API"
)
MESSAGE
(
STATUS
" FAILED to find Emotiv API
(optional)
"
)
ENDIF
(
PATH_EmotivAPI
)
cmake-modules/FindThirdPartyGMobiLabPlusAPI.cmake
View file @
b8c02436
...
...
@@ -59,7 +59,7 @@ IF(UNIX)
ADD_DEFINITIONS
(
-DTARGET_HAS_ThirdPartyGMobiLabPlusAPI
)
TARGET_LINK_LIBRARIES
(
${
PROJECT_NAME
}
${
gMOBIlabplus_LIBRARY
}
)
ELSE
(
gMOBIlabplus_LIBRARY
)
MESSAGE
(
STATUS
" FAILED to find GMobiLabPlusAPI... "
)
MESSAGE
(
STATUS
" FAILED to find GMobiLabPlusAPI...
(optional)
"
)
MESSAGE
(
STATUS
" : If it should be found, see that 'gmobilabapi.so' link exists on the fs, with no numeric suffixes in the filename."
)
MESSAGE
(
STATUS
" : e.g. do 'cd /usr/lib/ ; ln -s libgmobilabplusapi.so.1.12 libgmobilabplusapi.so' "
)
ENDIF
(
gMOBIlabplus_LIBRARY
)
...
...
cmake-modules/FindThirdPartyGUSBampCAPI.cmake
View file @
b8c02436
...
...
@@ -35,7 +35,7 @@ IF(WIN32)
SET
(
OV_ThirdPartyGUSBAmp
"YES"
)
ELSE
(
PATH_GUSBampCAPI
)
MESSAGE
(
STATUS
" FAILED to find gUSBampCAPI"
)
MESSAGE
(
STATUS
" FAILED to find gUSBampCAPI
(optional)
"
)
ENDIF
(
PATH_GUSBampCAPI
)
ENDIF
(
WIN32
)
...
...
@@ -49,10 +49,10 @@ IF(UNIX)
MESSAGE
(
STATUS
" [ OK ] Third party lib
${
gUSBAmpLinux_LIBRARY
}
"
)
ADD_DEFINITIONS
(
-DTARGET_HAS_ThirdPartyGUSBampCAPI_Linux
)
TARGET_LINK_LIBRARIES
(
${
PROJECT_NAME
}
${
gUSBAmpLinux_LIBRARY
}
)
SET
(
OV_ThirdPartyGUSBAmp
"YES"
)
ELSE
(
gUSBAmpLinux_LIBRARY
)
MESSAGE
(
STATUS
" FAILED to find GUSBAmpAPI Linux... "
)
MESSAGE
(
STATUS
" FAILED to find GUSBAmpAPI Linux...
(optional)
"
)
MESSAGE
(
STATUS
" : If it should be found, see that 'libgusbampapi.so.1.14' link exists on the fs, with no further nemeric suffixes in the filename."
)
MESSAGE
(
STATUS
" : e.g. do 'cd /usr/lib/ ; ln -s libgusbampapi.so.1.14'. See gtec-bcilab/README for details."
)
ENDIF
(
gUSBAmpLinux_LIBRARY
)
SET
(
OV_ThirdPartyGUSBAmp
"YES"
)
ENDIF
(
UNIX
)
cmake-modules/FindThirdPartyOgre3D.cmake
View file @
b8c02436
...
...
@@ -46,7 +46,7 @@ ENDIF(WIN32)
IF
(
UNIX
)
INCLUDE
(
"FindThirdPartyPkgConfig"
)
pkg_check_modules
(
Ogre3D OGRE
<=1.8.1
)
pkg_check_modules
(
Ogre3D OGRE
)
pkg_check_modules
(
OIS OIS
)
ENDIF
(
UNIX
)
...
...
cmake-modules/FindThirdPartyThinkGearAPI.cmake
View file @
b8c02436
...
...
@@ -31,5 +31,5 @@ IF(WIN32)
ENDIF
(
WIN32
)
IF
(
UNIX
)
MESSAGE
(
STATUS
"
The
ThinkGear API for Neurosky MindSet
is
only available on windows."
)
MESSAGE
(
STATUS
"
Skipped
ThinkGear API for Neurosky MindSet
,
only available on windows."
)
ENDIF
(
UNIX
)
contrib/plugins/processing/classification/CMakeLists.txt
View file @
b8c02436
PROJECT
(
openvibe-plugins-contrib-classification
)
SET
(
PROJECT_VERSION_MAJOR
${
OV_GLOBAL_VERSION_MAJOR
}
)
SET
(
PROJECT_VERSION_MINOR
${
OV_GLOBAL_VERSION_MINOR
}
)
SET
(
PROJECT_VERSION_PATCH
${
OV_GLOBAL_VERSION_PATCH
}
)
SET
(
PROJECT_VERSION
${
PROJECT_VERSION_MAJOR
}
.
${
PROJECT_VERSION_MINOR
}
.
${
PROJECT_VERSION_PATCH
}
)
# fill this once there is a contribution to this category...
FILE
(
GLOB_RECURSE source_files src/*.cpp src/*.h src/*.inl
)
ADD_LIBRARY
(
${
PROJECT_NAME
}
SHARED
${
source_files
}
)
SET_TARGET_PROPERTIES
(
${
PROJECT_NAME
}
PROPERTIES
VERSION
${
PROJECT_VERSION
}
SOVERSION
${
PROJECT_VERSION_MAJOR
}
COMPILE_FLAGS
"-DOV_Exports -DOV_Shared"
)
INCLUDE
(
"FindOpenViBE"
)
INCLUDE
(
"FindOpenViBECommon"
)
# INCLUDE("FindOpenViBEToolkit")
# INCLUDE("FindOpenViBEModuleEBML")
# INCLUDE("FindOpenViBEModuleSystem")
# INCLUDE("FindThirdPartyITPP")
# INCLUDE("FindOpenViBEModuleXML")#for gragient descent lda
# ---------------------------------
# Target macros
# Defines target operating system
# Defines target architecture
# Defines target compiler
# ---------------------------------
IF
(
WIN32
)
ADD_DEFINITIONS
(
-D_CRT_SECURE_NO_DEPRECATE
)
ADD_DEFINITIONS
(
-DTARGET_OS_Windows
)
ADD_DEFINITIONS
(
-DTARGET_ARCHITECTURE_i386
)
ADD_DEFINITIONS
(
-DTARGET_COMPILER_VisualStudio
)
ENDIF
(
WIN32
)
IF
(
UNIX
)
# ADD_DEFINITIONS(-fvisibility=hidden) # This flag should be present... man gcc
ADD_DEFINITIONS
(
-g
)
ADD_DEFINITIONS
(
-fnon-call-exceptions
)
ADD_DEFINITIONS
(
-DTARGET_OS_Linux
)
ADD_DEFINITIONS
(
-DTARGET_ARCHITECTURE_i386
)
ADD_DEFINITIONS
(
-DTARGET_COMPILER_GCC
)
ENDIF
(
UNIX
)
# -----------------------------
# Install files
# -----------------------------
INSTALL
(
TARGETS
${
PROJECT_NAME
}
RUNTIME DESTINATION
${
CMAKE_INSTALL_FULL_BINDIR
}
LIBRARY DESTINATION
${
CMAKE_INSTALL_FULL_LIBDIR
}
ARCHIVE DESTINATION
${
CMAKE_INSTALL_FULL_LIBDIR
}
)
#INSTALL(DIRECTORY src/ DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "doc" EXCLUDE)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment