Commit 6b4e7a4b authored by Jussi Lindgren's avatar Jussi Lindgren

build:

 * This commit has a lot of changes primarily done for Linux packaging
 + Added debian/ folder that contains files to build an elementary OpenViBE Debian/Ubuntu/Mint package 
 * All OpenViBE libraries and executables now have lowercase filenames in the filesystem
 * The "-dynamic" postfix is no longer appended as dynamic linking is the default. Static builds still retain the "-static" postfix. Note also that the static-linking builds may have broken at some point as they're not used in devel/test cycle. Static linking can be fixed/supported later if needed (let us know).  
 * Launch scripts:
   - The launch scripts are now be called openvibe-*.
   - On Linux, launch scripts (.sh extension) are only be used for development. There is no need to package them. 
   - On Linux, Openvibe related environment path variables are not used by default, but they can be set in the (development) launch scripts if desired to override the install location set by CMake.
   - On Windows, launch scripts (.cmd) are still needed and installed to install root.
   - On Windows, only environment variable that remains is OV_PATH_ROOT, which the launch scripts set as their location in the filesystem. The install tree is assumed to be a fixed one in a known relative position to the script location. 
 * Directories.h: in case the OV_PATH_* ENV variables are not set, the path getters return locations defined by CMake and the install targets that were specified at build time
 * Plugins.cfg of Ogre is now called openvibe-ogre-plugins.cfg and installed to "share/". Removed the executable bit from it.
 * All OpenViBE subprojects now by default copy the version numbers from the global variables set in the main CMakeLists.txt. If you wish to maintain unique versions for a subproject, you can change the version in that project's own CMakeLists.txt.
 * External Application Launcher:
   - External Application Launcher entry in openvibe.conf is now specified with a path token instead of ENV var.
   - External Application Launcher now takes as a parameter the name of the actual openvibe executable(!), NOT the launcher script as before. This is to retain compatibility with Linux package that may not have the launcher scripts.
   - INCOMPATIBILITY: This will introduce an issue with scenarios that have relied on the previous behaviour. This has been taken care of in scenarios included with OpenViBE.
 + Added Boost_System and X11 dependencies to kernel as Linux packaging on Mint/Ubuntu ("lintian") was complaining of missing deps
 + Added FindThirdPartyBoost_System.cmake
 + Added FindThirdPartyPThreadsVCE2.cmake, changed acquisition server CMakeLists.txt to use it instead of hardcoding (FieldTrip driver relies on this on Win)
 * Updated README to contain a bit less of information that is likely to go stale.
 * Unified and cleaned up the Linux CMake build so that it uses CMake variables for paths like the Windows build does, not environment variables.
applications/acquisition-server:
 * Changed some acquisition server drivers to use ${Path_Bin} instead of Directories::getBinDir().
openvibe-scenarios:
 * Lua scripts: removed the first line mentioning interpreter as it can be in different locations on different Linux distros. Also, these .lua files are not executed from a shell command line, so the line is not strictly needed.
 * SSVEP-Demo: Converted the two separate launching scripts into one script that takes shooter/training as a parameter. This is because after Linux packaging, we have no launch scripts, but would still like the SSVEP scenario to be runnable from the package. SSVEP scenario makes the same external app call on Linux and Windows systems, but if we're on a Linux package there'll be just one executable, not two scripts.
 * Fixed a show-stopping typo in classifier-training-flipswitch.lua
openvibe-modules:
 * Moved matroska_ebml_syntax.txt to openvibe-modules/ebml/ from the share/ root.
kernel:
 * Designer default work path in openvibe.conf is now share/openvibe-scenarios/


git-svn-id: svn://scm.gforge.inria.fr/svn/openvibe@3563 c330d7e9-fc0c-0410-a5b3-fd85c6f5aa8f
parent 66859b74
......@@ -2,18 +2,28 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(OpenVIBE)
MESSAGE(STATUS "Appending compilation flags...")
# These versions are used by the subprojects by default.
# If you wish to maintain specific version numbers for a subproject, please do so in the projects CMakeLists.txt
SET(OV_GLOBAL_VERSION_MAJOR 0)
SET(OV_GLOBAL_VERSION_MINOR "X")
SET(OV_GLOBAL_VERSION_PATCH "Y")
# Default is to build to dist/. If you wish a custom install, set your own MAKE_INSTALL_PREFIX when you call CMake. Safest to do under a fakeroot.
IF(NOT CMAKE_INSTALL_PREFIX)
SET(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/dist")
ENDIF(NOT CMAKE_INSTALL_PREFIX)
MESSAGE(STATUS "Appending compilation flags...")
IF(WIN32)
ADD_DEFINITIONS("-DNOMINMAX")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4355")
SET(OV_CUSTOM_DEPENDENCIES_PATH "${CMAKE_SOURCE_DIR}/dependencies")
ELSEIF(UNIX)
# Dependency folder
SET(ENV{OpenViBE_dependencies} "${CMAKE_SOURCE_DIR}/scripts/software")
SET(ENV{VRPN_ROOT} $ENV{OpenViBE_dependencies})
SET(ENV{PKG_CONFIG_PATH} "$ENV{OpenViBE_dependencies}/lib/pkgconfig")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
SET(OV_CUSTOM_DEPENDENCIES_PATH "${CMAKE_SOURCE_DIR}/scripts/software")
# This ENV var is needed to locate our custom IT++ on Linux
SET(ENV{PKG_CONFIG_PATH} "${OV_CUSTOM_DEPENDENCIES_PATH}/lib/pkgconfig")
ELSE(WIN32)
MESSAGE(WARNING "Warning: unknown platform")
ENDIF(WIN32)
......@@ -23,7 +33,6 @@ IF(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE "Release")
ENDIF(NOT CMAKE_BUILD_TYPE)
# Print the used compilation parameters (for transparency)
GET_DIRECTORY_PROPERTY(TMP_DEFINITIONS COMPILE_DEFINITIONS)
MESSAGE(STATUS "Compilation flags used at source root: ")
......@@ -35,6 +44,8 @@ MESSAGE(STATUS " CMAKE_CXX_FLAGS_DEBUG = '${CMAKE_CXX_FLAGS_DEBUG}'")
# if no specific branch has been given for an openvibe component, default is to compile its trunk folder
SET(OV_TRUNK "trunc")
# SET(OV_COMPILE_TESTS "true")
# To compile your own non-trunk branches, add variables OV_BRANCH_[DIR OR DIR_DIR] to point to "branches/YOURBRANCH" for each.
# Branch name __SKIPME signifies that this component should not be compiled or installed.
# SET(OV_BRANCH_PLUGINS_PYTHON "__SKIPME") # skips python module
......@@ -80,7 +91,6 @@ SET(OV_BRANCH_DOCUMENTATION "__SKIPME") # skips documentation module
#SET(OV_BRANCH_APPLICATIONS_VRPN-SIMULATOR "branches/mybranch")
#SET(OV_BRANCH_DOCUMENTATION "branches/mybranch")
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake-modules")
# If you wish you can uncomment the next line and add a file with additional information called OVBranches.cmake to
......@@ -90,6 +100,7 @@ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake-modules")
# a list of all project which will be filled by the directory traversal. This is needed to generate the documentation.
SET_PROPERTY(GLOBAL PROPERTY OV_PROP_CURRENT_PROJECTS "")
# Used by the various Find* scripts to locate OpenViBE modules
SET(OV_BASE_DIR ${CMAKE_SOURCE_DIR})
# needed for making visual studio projects when this script is called without CMAKE_BUILD_TYPE
......@@ -97,26 +108,21 @@ SET_PROPERTY(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG "TARGET_BUILDTY
SET_PROPERTY(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE "TARGET_BUILDTYPE_Release")
SET_PROPERTY(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO "TARGET_BUILDTYPE_Release")
IF(WIN32)
IF(NOT CMAKE_INSTALL_PREFIX)
SET(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/dist")
ENDIF(NOT CMAKE_INSTALL_PREFIX)
SET(OV_WIN32_DEP_DIR "${CMAKE_SOURCE_DIR}/dependencies")
ENDIF(WIN32)
IF(UNIX)
# Remove the following line when doing linux packaging so target should be the usual GNU root tree
# WARNING: Not tested yet. Try on virtualbox first.
IF(NOT CMAKE_INSTALL_PREFIX)
SET(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/dist")
ENDIF(NOT CMAKE_INSTALL_PREFIX)
ENDIF(UNIX)
# OpenViBE-specific helper functions that are used by the CMakeLists of the subprojects.
INCLUDE("OvAddSingleProject")
INCLUDE("OvAddProjects")
INCLUDE("OvInstallLaunchScript")
# Setup knowledge of GNU-style install path variables
INCLUDE("GNUInstallDirs")
# Add directories that OpenViBE will use to look for its components runtime, unless overridden by environment variables in the launch scripts.
# These defines should only be used in "ov_directories.h".
ADD_DEFINITIONS(-DOV_CMAKE_PATH_ROOT="${CMAKE_INSTALL_PREFIX}")
ADD_DEFINITIONS(-DOV_CMAKE_PATH_BIN="${CMAKE_INSTALL_FULL_BINDIR}")
ADD_DEFINITIONS(-DOV_CMAKE_PATH_DATA="${CMAKE_INSTALL_FULL_DATADIR}")
ADD_DEFINITIONS(-DOV_CMAKE_PATH_LIB="${CMAKE_INSTALL_FULL_LIBDIR}")
# Traverse these directories and build their components
ADD_SUBDIRECTORY("openvibe/")
ADD_SUBDIRECTORY("openvibe-kernel-omk/")
......@@ -130,28 +136,27 @@ ADD_SUBDIRECTORY("openvibe-documentation/") # needs to be the last since it uses
# make a copy of the dependency script, this is done so we can use the same launch scripts both in win install and win devel situations.
IF(WIN32)
INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/scripts/win32-dependencies.cmd DESTINATION ${CMAKE_INSTALL_PREFIX}/bin RENAME "OpenViBE-set-env.cmd")
INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/scripts/win32-dependencies.cmd DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} RENAME "openvibe-set-env.cmd")
ENDIF(WIN32)
# ----------------------
# Generate 'external application launcher' script
# ----------------------
IF(WIN32)
SET(OV_EXT_CMD_FILE "OpenViBE-external-application-launcher.cmd")
SET(OV_EXT_CMD_FILE "openvibe-external-application-launcher.cmd")
ENDIF(WIN32)
IF(UNIX)
SET(OV_EXT_CMD_FILE "OpenViBE-external-application-launcher.sh")
SET(OV_EXT_CMD_FILE "openvibe-external-application-launcher")
ENDIF(UNIX)
CONFIGURE_FILE("${CMAKE_MODULE_PATH}/launchers/${OV_EXT_CMD_FILE}-base" "${CMAKE_CURRENT_BINARY_DIR}/${OV_EXT_CMD_FILE}")
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${OV_EXT_CMD_FILE} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
# create the Plugins.cfg file for Ogre on UNIX
# create the openvibe-ogre-plugins.cfg file for Ogre on UNIX
IF(UNIX)
execute_process(COMMAND pkg-config --variable=plugindir OGRE OUTPUT_VARIABLE OGRE3D_PLUGIN_PATH)
CONFIGURE_FILE("${CMAKE_MODULE_PATH}/launchers/Plugins.cfg-base" "${CMAKE_CURRENT_BINARY_DIR}/Plugins.cfg")
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/Plugins.cfg DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
CONFIGURE_FILE("${CMAKE_MODULE_PATH}/launchers/openvibe-ogre-plugins.cfg-base" "${CMAKE_CURRENT_BINARY_DIR}/openvibe-ogre-plugins.cfg")
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/openvibe-ogre-plugins.cfg DESTINATION ${CMAKE_INSTALL_FULL_DATADIR})
ENDIF(UNIX)
......
......@@ -135,6 +135,15 @@ and then change to the appropriate subtree under local-tmp/. There you can call
3. If you made it this far, congratulations : you should now have OpenViBE freshly
built to "dist/".
|Elementary Linux packaging|
To build an elementary Debian/Ubuntu/Mint package from the official tarball (>= 0.16.0)
using debhelper, do the following:
# mv openvibe-X.Y.Z.tar.gz openvibe_X.Y.Z.orig.tar.gz
# tar xzvf openvibe_X.Y.Z.orig.tar.gz
# cd openvibe-X.Y.Z
# debuild -uc -us
|Contribution.rules|
......
......@@ -11,17 +11,10 @@ information on what you just downloaded.
|Code.source.access|
The source code of the project can be found on the INRIA gForge :
The source code of the project can be found by following links
on the OpenViBE homepage :
https://gforge.inria.fr/projects/openvibe/ (welcome page)
https://gforge.inria.fr/mail/?group_id=276 (mailing lists)
http://www.irisa.fr/bunraku/OpenViBE/forum (forums)
https://gforge.inria.fr/tracker/?group_id=276 (bug tracker)
Getting the latest (unstable) version of the source code from the forge can
be done thanks to this command :
svn checkout svn+ssh://developername@scm.gforge.inria.fr/svn/openvibe/trunk
http://openvibe.inria.fr/
|Repository.organisation|
......@@ -31,7 +24,7 @@ from other modules. The repository basically looks like this :
root of the repository
+ <openvibe> (API / specifications)
+ <openvibe-kernel> (kernel implementation)
+ <openvibe-kernel-omk> (kernel implementation)
+ <openvibe-toolkit> (development help components)
+ <openvibe-applications> (OpenViBE user applications)
+ <acquisition-server>
......@@ -71,11 +64,9 @@ Finally, in each branch, each software module is divided in the following UNIX-l
|Support|
You can get support for this software in several ways :
Please follow the links on the OpenViBE homepage:
- register to several mailing lists (https://gforge.inria.fr/mail/?group_id=276)
- use a phpBB forum (http://www.irisa.fr/bunraku/OpenViBE/forum)
- join an IRC channel (#openvibe on irc.freenode.net)
http://openvibe.inria.fr/
|Licence|
......
......@@ -10,9 +10,9 @@ IF(DYNAMIC_LINK_OPENVIBE)
ENDIF(DYNAMIC_LINK_OPENVIBE)
IF(DYNAMIC_LINK_OPENVIBE)
SET(OPENVIBE_LINKING dynamic)
SET(OPENVIBE_LINKING "")
ELSE(DYNAMIC_LINK_OPENVIBE)
SET(OPENVIBE_LINKING static)
SET(OPENVIBE_LINKING "-static")
ENDIF(DYNAMIC_LINK_OPENVIBE)
IF(OV_BRANCH_OPENVIBE)
......@@ -26,7 +26,7 @@ IF(PATH_OPENVIBE)
MESSAGE(STATUS " Found OpenViBE...")
INCLUDE_DIRECTORIES(${PATH_OPENVIBE}/src/)
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic OpenViBE-${OPENVIBE_LINKING})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} openvibe${OPENVIBE_LINKING})
ADD_DEFINITIONS(-DTARGET_HAS_OpenViBE)
ELSE(PATH_OPENVIBE)
......
......@@ -10,9 +10,9 @@ IF(DYNAMIC_LINK_OPENVIBE_MODULE_AUTOMATON)
ENDIF(DYNAMIC_LINK_OPENVIBE_MODULE_AUTOMATON)
IF(DYNAMIC_LINK_OPENVIBE_MODULE_AUTOMATON)
SET(OPENVIBE_MODULE_AUTOMATON_LINKING dynamic)
SET(OPENVIBE_MODULE_AUTOMATON_LINKING "")
ELSE(DYNAMIC_LINK_OPENVIBE_MODULE_AUTOMATON)
SET(OPENVIBE_MODULE_AUTOMATON_LINKING static)
SET(OPENVIBE_MODULE_AUTOMATON_LINKING "-static")
ENDIF(DYNAMIC_LINK_OPENVIBE_MODULE_AUTOMATON)
IF(OV_BRANCH_MODULES_AUTOMATON)
......@@ -26,7 +26,7 @@ IF(PATH_OPENVIBE_MODULES_AUTOMATON)
MESSAGE(STATUS " Found OpenViBE module Automaton...")
INCLUDE_DIRECTORIES(${PATH_OPENVIBE_MODULES_AUTOMATON}/src/)
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic OpenViBE-module-Automaton-${OPENVIBE_MODULE_AUTOMATON_LINKING})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} openvibe-module-automaton${OPENVIBE_MODULE_AUTOMATON_LINKING})
ADD_DEFINITIONS(-DTARGET_HAS_Automaton)
ELSE(PATH_OPENVIBE_MODULES_AUTOMATON)
......
......@@ -10,9 +10,9 @@ IF(DYNAMIC_LINK_OPENVIBE_MODULE_EBML)
ENDIF(DYNAMIC_LINK_OPENVIBE_MODULE_EBML)
IF(DYNAMIC_LINK_OPENVIBE_MODULE_EBML)
SET(OPENVIBE_MODULE_EBML_LINKING dynamic)
SET(OPENVIBE_MODULE_EBML_LINKING "")
ELSE(DYNAMIC_LINK_OPENVIBE_MODULE_EBML)
SET(OPENVIBE_MODULE_EBML_LINKING static)
SET(OPENVIBE_MODULE_EBML_LINKING "-static")
ENDIF(DYNAMIC_LINK_OPENVIBE_MODULE_EBML)
IF(OV_BRANCH_MODULES_EBML)
......@@ -26,7 +26,7 @@ IF(PATH_OPENVIBE_MODULES_EBML)
MESSAGE(STATUS " Found OpenViBE module EBML...")
INCLUDE_DIRECTORIES(${PATH_OPENVIBE_MODULES_EBML}/src/)
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic OpenViBE-module-EBML-${OPENVIBE_MODULE_EBML_LINKING})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} openvibe-module-ebml${OPENVIBE_MODULE_EBML_LINKING})
ADD_DEFINITIONS(-DTARGET_HAS_EBML)
ELSE(PATH_OPENVIBE_MODULES_EBML)
......
......@@ -10,9 +10,9 @@ IF(DYNAMIC_LINK_OPENVIBE_MODULE_FS)
ENDIF(DYNAMIC_LINK_OPENVIBE_MODULE_FS)
IF(DYNAMIC_LINK_OPENVIBE_MODULE_FS)
SET(OPENVIBE_MODULE_FS_LINKING dynamic)
SET(OPENVIBE_MODULE_FS_LINKING "")
ELSE(DYNAMIC_LINK_OPENVIBE_MODULE_FS)
SET(OPENVIBE_MODULE_FS_LINKING static)
SET(OPENVIBE_MODULE_FS_LINKING "-static")
ENDIF(DYNAMIC_LINK_OPENVIBE_MODULE_FS)
IF(OV_BRANCH_MODULES_FS)
......@@ -26,7 +26,7 @@ IF(PATH_OPENVIBE_MODULES_FS)
MESSAGE(STATUS " Found OpenViBE module FS...")
INCLUDE_DIRECTORIES(${PATH_OPENVIBE_MODULES_FS}/src/)
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic OpenViBE-module-FS-${OPENVIBE_MODULE_FS_LINKING})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} openvibe-module-fs${OPENVIBE_MODULE_FS_LINKING})
ADD_DEFINITIONS(-DTARGET_HAS_FS)
ELSE(PATH_OPENVIBE_MODULES_FS)
......
......@@ -10,9 +10,9 @@ IF(DYNAMIC_LINK_OPENVIBE_MODULE_SOCKET)
ENDIF(DYNAMIC_LINK_OPENVIBE_MODULE_SOCKET)
IF(DYNAMIC_LINK_OPENVIBE_MODULE_SOCKET)
SET(OPENVIBE_MODULE_SOCKET_LINKING dynamic)
SET(OPENVIBE_MODULE_SOCKET_LINKING "")
ELSE(DYNAMIC_LINK_OPENVIBE_MODULE_SOCKET)
SET(OPENVIBE_MODULE_SOCKET_LINKING static)
SET(OPENVIBE_MODULE_SOCKET_LINKING "-static")
ENDIF(DYNAMIC_LINK_OPENVIBE_MODULE_SOCKET)
IF(OV_BRANCH_MODULES_SOCKET)
......@@ -26,7 +26,7 @@ IF(PATH_OPENVIBE_MODULES_SOCKET)
MESSAGE(STATUS " Found OpenViBE module Socket...")
INCLUDE_DIRECTORIES(${PATH_OPENVIBE_MODULES_SOCKET}/src/)
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic OpenViBE-module-Socket-${OPENVIBE_MODULE_SOCKET_LINKING})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} openvibe-module-socket${OPENVIBE_MODULE_SOCKET_LINKING})
ADD_DEFINITIONS(-DTARGET_HAS_Socket)
ELSE(PATH_OPENVIBE_MODULES_SOCKET)
......
......@@ -10,9 +10,9 @@ IF(DYNAMIC_LINK_OPENVIBE_MODULE_STREAM)
ENDIF(DYNAMIC_LINK_OPENVIBE_MODULE_STREAM)
IF(DYNAMIC_LINK_OPENVIBE_MODULE_STREAM)
SET(OPENVIBE_MODULE_STREAM_LINKING dynamic)
SET(OPENVIBE_MODULE_STREAM_LINKING "")
ELSE(DYNAMIC_LINK_OPENVIBE_MODULE_STREAM)
SET(OPENVIBE_MODULE_STREAM_LINKING static)
SET(OPENVIBE_MODULE_STREAM_LINKING "-static")
ENDIF(DYNAMIC_LINK_OPENVIBE_MODULE_STREAM)
IF(OV_BRANCH_MODULES_STREAM)
......@@ -26,7 +26,7 @@ IF(PATH_OPENVIBE_MODULES_STREAM)
MESSAGE(STATUS " Found OpenViBE module Stream...")
INCLUDE_DIRECTORIES(${PATH_OPENVIBE_MODULES_STREAM}/include)
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic OpenViBE-module-Stream-${OPENVIBE_MODULE_STREAM_LINKING})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} openvibe-module-stream${OPENVIBE_MODULE_STREAM_LINKING})
ADD_DEFINITIONS(-DTARGET_HAS_Stream)
ELSE(PATH_OPENVIBE_MODULES_STREAM)
......
......@@ -10,9 +10,9 @@ IF(DYNAMIC_LINK_OPENVIBE_MODULE_SYSTEM)
ENDIF(DYNAMIC_LINK_OPENVIBE_MODULE_SYSTEM)
IF(DYNAMIC_LINK_OPENVIBE_MODULE_SYSTEM)
SET(OPENVIBE_MODULE_SYSTEM_LINKING dynamic)
SET(OPENVIBE_MODULE_SYSTEM_LINKING "")
ELSE(DYNAMIC_LINK_OPENVIBE_MODULE_SYSTEM)
SET(OPENVIBE_MODULE_SYSTEM_LINKING static)
SET(OPENVIBE_MODULE_SYSTEM_LINKING "-static")
ENDIF(DYNAMIC_LINK_OPENVIBE_MODULE_SYSTEM)
......@@ -27,7 +27,7 @@ IF(PATH_OPENVIBE_MODULES_SYSTEM)
MESSAGE(STATUS " Found OpenViBE module System...")
INCLUDE_DIRECTORIES(${PATH_OPENVIBE_MODULES_SYSTEM}/src/)
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic OpenViBE-module-System-${OPENVIBE_MODULE_SYSTEM_LINKING})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} openvibe-module-system${OPENVIBE_MODULE_SYSTEM_LINKING})
ADD_DEFINITIONS(-DTARGET_HAS_System)
ELSE(PATH_OPENVIBE_MODULES_SYSTEM)
......
......@@ -10,9 +10,9 @@ IF(DYNAMIC_LINK_OPENVIBE_MODULE_XML)
ENDIF(DYNAMIC_LINK_OPENVIBE_MODULE_XML)
IF(DYNAMIC_LINK_OPENVIBE_MODULE_XML)
SET(OPENVIBE_MODULE_XML_LINKING dynamic)
SET(OPENVIBE_MODULE_XML_LINKING "")
ELSE(DYNAMIC_LINK_OPENVIBE_MODULE_XML)
SET(OPENVIBE_MODULE_XML_LINKING static)
SET(OPENVIBE_MODULE_XML_LINKING "-static")
ENDIF(DYNAMIC_LINK_OPENVIBE_MODULE_XML)
......@@ -27,7 +27,7 @@ IF(PATH_OPENVIBE_MODULES_XML)
MESSAGE(STATUS " Found OpenViBE module XML...")
INCLUDE_DIRECTORIES(${PATH_OPENVIBE_MODULES_XML}/src/)
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic OpenViBE-module-XML-${OPENVIBE_MODULE_XML_LINKING})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} openvibe-module-xml${OPENVIBE_MODULE_XML_LINKING})
ADD_DEFINITIONS(-DTARGET_HAS_XML)
ELSE(PATH_OPENVIBE_MODULES_XML)
......
# ---------------------------------
# Finds OpenViBE-toolkit
# Finds openvibe-toolkit
# Adds library to target
# Adds include path
# ---------------------------------
OPTION(DYNAMIC_LINK_OPENVIBE_TOOLKIT "Dynamically link OpenViBE-toolkit" ON)
OPTION(DYNAMIC_LINK_OPENVIBE_TOOLKIT "Dynamically link openvibe-toolkit" ON)
IF(DYNAMIC_LINK_OPENVIBE_TOOLKIT)
ADD_DEFINITIONS(-DOVTK_Shared)
ENDIF(DYNAMIC_LINK_OPENVIBE_TOOLKIT)
IF(DYNAMIC_LINK_OPENVIBE_TOOLKIT)
SET(OPENVIBE_TOOLKIT_LINKING dynamic)
SET(OPENVIBE_TOOLKIT_LINKING "")
ELSE(DYNAMIC_LINK_OPENVIBE_TOOLKIT)
SET(OPENVIBE_TOOLKIT_LINKING static)
SET(OPENVIBE_TOOLKIT_LINKING "-static")
ENDIF(DYNAMIC_LINK_OPENVIBE_TOOLKIT)
IF(OV_BRANCH_TOOLKIT)
......@@ -23,14 +23,14 @@ ENDIF(OV_BRANCH_TOOLKIT)
FIND_PATH(PATH_OPENVIBE_TOOLKIT src/openvibe-toolkit/ovtk_all.h PATHS ${SRC_DIR})
IF(PATH_OPENVIBE_TOOLKIT)
MESSAGE(STATUS " Found OpenViBE-toolkit...")
MESSAGE(STATUS " Found openvibe-toolkit...")
INCLUDE_DIRECTORIES(${PATH_OPENVIBE_TOOLKIT}/src/)
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic OpenViBE-toolkit-${OPENVIBE_TOOLKIT_LINKING})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} openvibe-toolkit${OPENVIBE_TOOLKIT_LINKING})
ADD_DEFINITIONS(-DTARGET_HAS_OpenViBEToolkit)
ELSE(PATH_OPENVIBE_TOOLKIT)
MESSAGE(STATUS " FAILED to find OpenViBE-toolkit...")
MESSAGE(STATUS " FAILED to find openvibe-toolkit...")
ENDIF(PATH_OPENVIBE_TOOLKIT)
......@@ -25,7 +25,7 @@
# Adds include path
# ---------------------------------
IF(WIN32)
FIND_PATH(PATH_ActiCHampAPI actiCHamp.h PATHS "C:/Program Files/actichamp" "C:/Program Files (x86)/actichamp" $ENV{OpenViBE_dependencies})
FIND_PATH(PATH_ActiCHampAPI actiCHamp.h PATHS "C:/Program Files/actichamp" "C:/Program Files (x86)/actichamp" ${OV_CUSTOM_DEPENDENCIES_PATH})
IF(PATH_ActiCHampAPI)
MESSAGE(STATUS " Found actiCHamp API...")
INCLUDE_DIRECTORIES(${PATH_ActiCHampAPI})
......@@ -33,7 +33,7 @@ IF(WIN32)
FIND_LIBRARY(LIB_ActiCHampAPI actiCHamp_x86 PATHS ${PATH_ActiCHampAPI} )
IF(LIB_ActiCHampAPI)
MESSAGE(STATUS " [ OK ] lib ${LIB_ActiCHampAPI}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic ${LIB_ActiCHampAPI} )
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_ActiCHampAPI} )
ELSE(LIB_ActiCHampAPI)
MESSAGE(STATUS " [FAILED] lib actiCHamp")
ENDIF(LIB_ActiCHampAPI)
......
......@@ -4,21 +4,21 @@
# Adds include path
# ---------------------------------
IF(UNIX)
FIND_PATH(PATH_BLiFF include/Trial.h PATHS $ENV{OpenViBE_dependencies})
FIND_PATH(PATH_BLiFF include/Trial.h PATHS ${OV_CUSTOM_DEPENDENCIES_PATH})
IF(PATH_BLiFF)
MESSAGE(STATUS " Found BLiFF++...")
INCLUDE_DIRECTORIES(${PATH_BLiFF}/include)
INCLUDE_DIRECTORIES($ENV{OpenViBE_dependencies}/include/itpp) # for itpp, BLiFF++ does not include files correctly
INCLUDE_DIRECTORIES($ENV{OpenViBE_dependencies}/include/itpp/base) # for itpp, BLiFF++ does not include files correctly
INCLUDE_DIRECTORIES($ENV{OpenViBE_dependencies}/include/itpp/base/algebra) # for itpp, BLiFF++ does not include files correctly
INCLUDE_DIRECTORIES($ENV{OpenViBE_dependencies}/include/itpp/comm) # for itpp, BLiFF++ does not include files correctly
INCLUDE_DIRECTORIES($ENV{OpenViBE_dependencies}/include/itpp/fixedpoint) # for itpp, BLiFF++ does not include files correctly
INCLUDE_DIRECTORIES($ENV{OpenViBE_dependencies}/include/itpp/protocol) # for itpp, BLiFF++ does not include files correctly
INCLUDE_DIRECTORIES($ENV{OpenViBE_dependencies}/include/itpp/srccode) # for itpp, BLiFF++ does not include files correctly
INCLUDE_DIRECTORIES(${OV_CUSTOM_DEPENDENCIES_PATH}/include/itpp) # for itpp, BLiFF++ does not include files correctly
INCLUDE_DIRECTORIES(${OV_CUSTOM_DEPENDENCIES_PATH}/include/itpp/base) # for itpp, BLiFF++ does not include files correctly
INCLUDE_DIRECTORIES(${OV_CUSTOM_DEPENDENCIES_PATH}/include/itpp/base/algebra) # for itpp, BLiFF++ does not include files correctly
INCLUDE_DIRECTORIES(${OV_CUSTOM_DEPENDENCIES_PATH}/include/itpp/comm) # for itpp, BLiFF++ does not include files correctly
INCLUDE_DIRECTORIES(${OV_CUSTOM_DEPENDENCIES_PATH}/include/itpp/fixedpoint) # for itpp, BLiFF++ does not include files correctly
INCLUDE_DIRECTORIES(${OV_CUSTOM_DEPENDENCIES_PATH}/include/itpp/protocol) # for itpp, BLiFF++ does not include files correctly
INCLUDE_DIRECTORIES(${OV_CUSTOM_DEPENDENCIES_PATH}/include/itpp/srccode) # for itpp, BLiFF++ does not include files correctly
FIND_LIBRARY(LIB_BLiFF bliff PATHS ${PATH_BLiFF}/lib )
IF(LIB_BLiFF)
MESSAGE(STATUS " [ OK ] lib ${LIB_BLiFF}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic ${LIB_BLiFF} )
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_BLiFF} )
ELSE(LIB_BLiFF)
MESSAGE(STATUS " [FAILED] lib bliff")
ENDIF(LIB_BLiFF)
......
......@@ -4,8 +4,8 @@
# Adds include path
# ---------------------------------
FIND_PATH(PATH_BOOST "include/boost/config/auto_link.hpp" PATHS ${OV_WIN32_DEP_DIR}/boost $ENV{OpenViBE_dependencies} NO_DEFAULT_PATH)
FIND_PATH(PATH_BOOST "include/boost/config/auto_link.hpp" PATHS ${OV_WIN32_DEP_DIR}/boost)
FIND_PATH(PATH_BOOST "include/boost/config/auto_link.hpp" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/boost ${OV_CUSTOM_DEPENDENCIES_PATH} NO_DEFAULT_PATH)
FIND_PATH(PATH_BOOST "include/boost/config/auto_link.hpp" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/boost)
IF(PATH_BOOST)
MESSAGE(STATUS " Found boost...")
......
......@@ -5,11 +5,11 @@
# ---------------------------------
IF(UNIX)
FIND_LIBRARY(LIB_Boost_Filesystem NAMES "boost_filesystem-mt" PATHS $ENV{OpenViBE_dependencies}/lib NO_DEFAULT_PATH)
FIND_LIBRARY(LIB_Boost_Filesystem NAMES "boost_filesystem-mt" PATHS $ENV{OpenViBE_dependencies}/lib)
FIND_LIBRARY(LIB_Boost_Filesystem NAMES "boost_filesystem-mt" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib NO_DEFAULT_PATH)
FIND_LIBRARY(LIB_Boost_Filesystem NAMES "boost_filesystem-mt" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib)
IF(LIB_Boost_Filesystem)
MESSAGE(STATUS " [ OK ] lib ${LIB_Boost_Filesystem}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic ${LIB_Boost_Filesystem} )
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_Boost_Filesystem} )
ELSE(LIB_Boost_Filesystem)
MESSAGE(STATUS " [FAILED] lib boost_Filesystem-mt")
ENDIF(LIB_Boost_Filesystem)
......@@ -18,7 +18,7 @@ IF(UNIX)
FIND_LIBRARY(LIB_STANDARD_MODULE_PTHREAD pthread)
IF(LIB_STANDARD_MODULE_PTHREAD)
MESSAGE(STATUS " Found pthread...")
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic ${LIB_STANDARD_MODULE_PTHREAD})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_STANDARD_MODULE_PTHREAD})
ELSE(LIB_STANDARD_MODULE_PTHREAD)
MESSAGE(STATUS " FAILED to find pthread...")
ENDIF(LIB_STANDARD_MODULE_PTHREAD)
......
......@@ -6,11 +6,11 @@
IF(UNIX)
FIND_LIBRARY(LIB_Boost_Regex NAMES "boost_regex-mt" PATHS $ENV{OpenViBE_dependencies}/lib NO_DEFAULT_PATH)
FIND_LIBRARY(LIB_Boost_Regex NAMES "boost_regex-mt" PATHS $ENV{OpenViBE_dependencies}/lib)
FIND_LIBRARY(LIB_Boost_Regex NAMES "boost_regex-mt" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib NO_DEFAULT_PATH)
FIND_LIBRARY(LIB_Boost_Regex NAMES "boost_regex-mt" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib)
IF(LIB_Boost_Regex)
MESSAGE(STATUS " [ OK ] lib ${LIB_Boost_Regex}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic ${LIB_Boost_Regex} )
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_Boost_Regex} )
ELSE(LIB_Boost_Regex)
MESSAGE(STATUS " [FAILED] lib boost_regex-mt")
ENDIF(LIB_Boost_Regex)
......
# ---------------------------------
# Finds third party boost
# Adds library to target
# Adds include path
# ---------------------------------
IF(UNIX)
FIND_LIBRARY(LIB_Boost_System NAMES "boost_system-mt" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib NO_DEFAULT_PATH)
FIND_LIBRARY(LIB_Boost_System NAMES "boost_system-mt" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib)
IF(LIB_Boost_System)
MESSAGE(STATUS " [ OK ] lib ${LIB_Boost_System}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_Boost_System} )
ELSE(LIB_Boost_System)
MESSAGE(STATUS " [FAILED] lib boost_system-mt")
ENDIF(LIB_Boost_System)
ENDIF(UNIX)
......@@ -5,11 +5,11 @@
# ---------------------------------
IF(UNIX)
FIND_LIBRARY(LIB_Boost_Thread NAMES "boost_thread-mt" PATHS $ENV{OpenViBE_dependencies}/lib NO_DEFAULT_PATH)
FIND_LIBRARY(LIB_Boost_Thread NAMES "boost_thread-mt" PATHS $ENV{OpenViBE_dependencies}/lib)
FIND_LIBRARY(LIB_Boost_Thread NAMES "boost_thread-mt" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib NO_DEFAULT_PATH)
FIND_LIBRARY(LIB_Boost_Thread NAMES "boost_thread-mt" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib)
IF(LIB_Boost_Thread)
MESSAGE(STATUS " [ OK ] lib ${LIB_Boost_Thread}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic ${LIB_Boost_Thread} )
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_Boost_Thread} )
ELSE(LIB_Boost_Thread)
MESSAGE(STATUS " [FAILED] lib boost_thread-mt")
ENDIF(LIB_Boost_Thread)
......@@ -18,7 +18,7 @@ IF(UNIX)
FIND_LIBRARY(LIB_STANDARD_MODULE_PTHREAD pthread)
IF(LIB_STANDARD_MODULE_PTHREAD)
MESSAGE(STATUS " Found pthread...")
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic ${LIB_STANDARD_MODULE_PTHREAD})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_STANDARD_MODULE_PTHREAD})
ELSE(LIB_STANDARD_MODULE_PTHREAD)
MESSAGE(STATUS " FAILED to find pthread...")
ENDIF(LIB_STANDARD_MODULE_PTHREAD)
......
......@@ -7,7 +7,7 @@ IF(WIN32)
FIND_PATH(PATH_BrainmasterCodeMakerAPI CMKRDLLU.H PATHS
"C:/Program Files/Atlantis & Discovery SW DLL 1-11-12"
"C:/Program Files (x86)/Atlantis & Discovery SW DLL 1-11-12"
$ENV{OpenViBE_dependencies})
${OV_CUSTOM_DEPENDENCIES_PATH})
IF(PATH_BrainmasterCodeMakerAPI)
MESSAGE(STATUS " Found Brainmaster Code Maker API...")
INCLUDE_DIRECTORIES(${PATH_BrainmasterCodeMakerAPI})
......@@ -18,7 +18,7 @@ IF(WIN32)
FIND_LIBRARY(LIB_BrainmasterCodeMakerAPI1 NAMES ${LIB_BrainmasterCodeMakerAPI})
IF(LIB_BrainmasterCodeMakerAPI1)
MESSAGE(STATUS " [ OK ] Third party lib ${LIB_BrainmasterCodeMakerAPI1}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic ${LIB_BrainmasterCodeMakerAPI1})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_BrainmasterCodeMakerAPI1})
ELSE(LIB_BrainmasterCodeMakerAPI1)
MESSAGE(STATUS " [FAILED] Third party lib ${LIB_BrainmasterCodeMakerAPI}")
ENDIF(LIB_BrainmasterCodeMakerAPI1)
......
......@@ -12,7 +12,7 @@
# ---------------------------------
IF(WIN32)
FIND_PATH(PATH_CEGUI cegui/include/CEGUI.h PATHS ${OV_WIN32_DEP_DIR}/cegui)
FIND_PATH(PATH_CEGUI cegui/include/CEGUI.h PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/cegui)
IF(PATH_CEGUI)
SET(CEGUI_FOUND TRUE)
SET(OgreCEGUIRenderer_FOUND TRUE)
......@@ -42,7 +42,7 @@ IF(UNIX)
FIND_LIBRARY(CEGUI_LIB1 NAMES ${CEGUI_LIB})
IF(CEGUI_LIB1)
MESSAGE(STATUS " [ OK ] Third party lib ${CEGUI_LIB1}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic ${CEGUI_LIB1})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${CEGUI_LIB1})
ELSE(CEGUI_LIB1)
MESSAGE(STATUS " [FAILED] Third party lib ${CEGUI_LIB}")
ENDIF(CEGUI_LIB1)
......@@ -55,7 +55,7 @@ IF(WIN32)
FIND_LIBRARY(CEGUI_LIB1 NAMES ${CEGUI_LIB})
IF(CEGUI_LIB1)
MESSAGE(STATUS " [ OK ] Third party lib ${CEGUI_LIB1}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic debug ${CEGUI_LIB1})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} debug ${CEGUI_LIB1})
ELSE(CEGUI_LIB1)
MESSAGE(STATUS " [FAILED] Third party lib ${CEGUI_LIB}")
ENDIF(CEGUI_LIB1)
......@@ -66,7 +66,7 @@ IF(WIN32)
FIND_LIBRARY(CEGUI_LIB1 NAMES ${CEGUI_LIB})
IF(CEGUI_LIB1)
MESSAGE(STATUS " [ OK ] Third party lib ${CEGUI_LIB1}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME}-dynamic optimized ${CEGUI_LIB1})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} optimized ${CEGUI_LIB1})
ELSE(CEGUI_LIB1)
MESSAGE(STATUS " [FAILED] Third party lib ${CEGUI_LIB}")
ENDIF(CEGUI_LIB1)
......
......@@ -5,7 +5,7 @@
# ---------------------------------
IF(WIN32)
FIND_PATH(PATH_EIGEN Eigen/Eigen PATHS ${OV_WIN32_DEP_DIR}/eigen)
FIND_PATH(PATH_EIGEN Eigen/Eigen PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/eigen)
IF(PATH_EIGEN)
SET(EIGEN_FOUND TRUE)
SET(EIGEN_INCLUDE_DIRS ${PATH_EIGEN})
......
......@@ -5,7 +5,7 @@
# ---------------------------------
IF(WIN32)
# edkErrorCode.h EmoStateDLL.h
#FIND_PATH(PATH_EmotivAPI edk.h PATHS "C:/Program Files/Emotiv Development Kit_v1.0.0.3-PREMIUM" "C:/Program Files/Emotiv Development Kit_v1.0.0.3-PREMIUM/doc/examples/include" "C:/Program Files (x86)/Emotiv Development Kit_v1.0.0.3-PREMIUM" "C:/Program Files (x86)/Emotiv Development Kit_v1.0.0.3-PREMIUM/doc/examples/include" $ENV{OpenViBE_dependencies})
#FIND_PATH(PATH_EmotivAPI edk.h PATHS "C:/Program Files/Emotiv Development Kit_v1.0.0.3-PREMIUM" "C:/Program Files/Emotiv Development Kit_v1.0.0.3-PREMIUM/doc/examples/include" "C:/Program Files (x86)/Emotiv Development Kit_v1.0.0.3-PREMIUM" "C:/Program Files (x86)/Emotiv Development Kit_v1.0.0.3-PREMIUM/doc/examples/include" ${OV_CUSTOM_DEPENDENCIES_PATH})
FILE(GLOB PATH_Candidates
"C:/Program Files/Emotiv Development Kit*"
"C:/Program Files/Emotiv Research Edition*"
......@@ -18,17 +18,17 @@ IF(WIN32)
ENDFOREACH(Candidate_folder ${PATH_Candidates})