Commit ccb6efe7 authored by nfoy's avatar nfoy

Merge branch 'wip-jlindgre-linux-install-clean' into integration-1.2

parents 08cdb9fa 984a84dc
......@@ -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")
......
......@@ -35,18 +35,18 @@ IF(WIN32)
ENDIF(WIN32)
IF(UNIX)
INCLUDE("FindThirdPartyPkgConfig")
pkg_check_modules(CEGUI CEGUI)
pkg_check_modules(OgreCEGUIRenderer CEGUI-OGRE)
# Assumes FindThirdPartyCEGUI_Check.cmake has been run
ENDIF(UNIX)
IF(CEGUI_FOUND AND OgreCEGUIRenderer_FOUND)
MESSAGE(STATUS " Found CEGUI/OgreCEGUIRenderer...")
INCLUDE_DIRECTORIES(${CEGUI_INCLUDE_DIRS} ${OgreCEGUIRenderer_INCLUDE_DIRS})
ADD_DEFINITIONS(${CEGUI_CFLAGS} ${OgreCEGUIRenderer_CFLAGS})
ADD_DEFINITIONS(${CEGUI_CFLAGS_OTHERS} ${OgreCEGUIRenderer_CFLAGS_OTHERS})
# LINK_DIRECTORIES(${CEGUI_LIBRARY_DIRS} ${OgreCEGUIRenderer_LIBRARY_DIRS})
IF(UNIX)
FOREACH(CEGUI_LIB ${CEGUI_LIBRARIES} ${OgreCEGUIRenderer_LIBRARIES})
SET(CEGUI_LIB1 "CEGUI_LIB1-NOTFOUND")
FIND_LIBRARY(CEGUI_LIB1 NAMES ${CEGUI_LIB} PATHS ${CEGUI_LIBRARY_DIRS} ${CEGUI_LIBDIR} NO_DEFAULT_PATH)
......
......@@ -22,9 +22,21 @@ IF(WIN32)
ENDIF(WIN32)
IF(UNIX)
INCLUDE("FindThirdPartyPkgConfig")
INCLUDE("FindPkgConfig")
SET(CEGUI_FOUND "-NOTFOUND")
pkg_check_modules(CEGUI CEGUI)
IF(NOT CEGUI_FOUND)
# we have this mess as the cegui filenames & paths are different on Fedora 21 at least,
# and the include_dirs doesn't contain the CEGUI/ part ... I'd put that to the .h/.cpp IF the same path
# convention was the case on all platforms... but it is not
pkg_check_modules(CEGUI CEGUI-0)
SET(CEGUI_INCLUDE_DIRS "${CEGUI_INCLUDE_DIRS}/CEGUI")
ENDIF(NOT CEGUI_FOUND)
SET(OgreCEGUIRenderer_FOUND "-NOTFOUND")
pkg_check_modules(OgreCEGUIRenderer CEGUI-OGRE)
IF(NOT OgreCEGUIRenderer_FOUND)
pkg_check_modules(OgreCEGUIRenderer CEGUI-0-OGRE)
ENDIF(NOT OgreCEGUIRenderer_FOUND)
ENDIF(UNIX)
IF(CEGUI_FOUND AND OgreCEGUIRenderer_FOUND)
......
......@@ -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)
......@@ -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)
......
......@@ -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)
......@@ -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)
......@@ -57,7 +57,11 @@ IF(Ogre3D_FOUND AND OIS_FOUND)
ADD_DEFINITIONS(${OIS_CFLAGS_OTHERS} ${Ogre3D_CFLAGS_OTHERS})
# MESSAGE(STATUS "A ${OIS_CFLAGS} ${Ogre3D_CFLAGS} B ${OIS_CFLAGS_OTHERS} ${Ogre3D_CFLAGS_OTHERS} C ${Ogre3D_LIBRARIES_RELEASE} D ${Ogre3D_LIBRARIES_DEBUG}")
IF(UNIX)
IF(UNIX)
IF(Ogre3D_VERSION VERSION_EQUAL "1.9.0" OR Ogre3D_VERSION VERSION_GREATER "1.9.0")
SET(Ogre3D_LIBRARIES "${Ogre3_LIBRARIES};OgreOverlay")
ENDIF(Ogre3D_VERSION VERSION_EQUAL "1.9.0" OR Ogre3D_VERSION VERSION_GREATER "1.9.0")
FOREACH(Ogre3D_LIB ${Ogre3D_LIBRARIES} ${OIS_LIBRARIES})
SET(Ogre3D_LIB1 "Ogre3D_LIB1-NOTFOUND")
FIND_LIBRARY(Ogre3D_LIB1 NAMES ${Ogre3D_LIB} PATHS ${Ogre3D_LIBRARY_DIRS} ${Ogre3D_LIBDIR} NO_DEFAULT_PATH)
......
......@@ -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)
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)
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment