Commit 0c68b96e authored by Jussi Lindgren's avatar Jussi Lindgren

Build: Various fixes

- Fixed Find files for ActiChamp and FFTW3
- Changed Mensia Acquisition and Enobio to install all DLLs to bin/
- Updated the .nsi scripts accordingly
- Updated .gitignore
parent 72db8d34
# The following are automatically generated by the build or dep installer
local-tmp local-tmp
dependencies dependencies
scripts/win32-dependencies.cmd scripts/win32-dependencies.cmd
dist dist
build build
plugins/processing/matlab/share/OV_stimulations.m
toolkit/include/toolkit/ovtk_stimulations.h
toolkit/src/ovtk_stimulations.cpp
# Editor swap files etc ...
CMakeLists.txt.* CMakeLists.txt.*
.*.swp .*.swp
externals/*/
*~ *~
*.swp *.swp
.project .project
.cproject .cproject
# Third party stuff
externals/*/
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
# Adds include path # Adds include path
# --------------------------------- # ---------------------------------
IF(WIN32) IF(WIN32)
FIND_PATH(PATH_ActiCHampAPI ActiChamp.h PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}) FIND_PATH(PATH_ActiCHampAPI ActiChamp.h PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/sdk-brainproducts-actichamp)
IF(PATH_ActiCHampAPI) IF(PATH_ActiCHampAPI)
MESSAGE(STATUS " Found actiCHamp API...") MESSAGE(STATUS " Found actiCHamp API...")
INCLUDE_DIRECTORIES(${PATH_ActiCHampAPI}) INCLUDE_DIRECTORIES(${PATH_ActiCHampAPI})
......
...@@ -11,7 +11,13 @@ IF(WIN32) ...@@ -11,7 +11,13 @@ IF(WIN32)
FIND_PATH(PATH_FFTW3 include/fftw3.h PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/itpp) FIND_PATH(PATH_FFTW3 include/fftw3.h PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/itpp)
IF(PATH_FFTW3) IF(PATH_FFTW3)
SET(FFTW3_FOUND TRUE) SET(FFTW3_FOUND TRUE)
SET(FFTW3_LIBRARIES libfftw3-3) # Of course the name of the library is this or that, depending on the circumstances ...
FIND_LIBRARY(FFTW3_TMP NAMES libfftw3-3_win32 PATHS ${PATH_FFTW3}/lib NO_DEFAULT_PATH)
IF(FFTW3_TMP)
SET(FFTW3_LIBRARIES libfftw3-3_win32)
ELSE(FFTW3_TMP)
SET(FFTW3_LIBRARIES libfftw3-3)
ENDIF(FFTW3_TMP)
SET(FFTW3_INCLUDE_DIRS ${PATH_FFTW3}/include ) SET(FFTW3_INCLUDE_DIRS ${PATH_FFTW3}/include )
SET(FFTW3_LIBRARY_DIRS ${PATH_FFTW3}/lib ) SET(FFTW3_LIBRARY_DIRS ${PATH_FFTW3}/lib )
ENDIF(PATH_FFTW3) ENDIF(PATH_FFTW3)
......
...@@ -6,7 +6,7 @@ ENDIF(WIN32) ...@@ -6,7 +6,7 @@ ENDIF(WIN32)
IF(PATH_MENSIA) IF(PATH_MENSIA)
MESSAGE(STATUS " Found Mensia Acquisition driver...") MESSAGE(STATUS " Found Mensia Acquisition driver...")
INSTALL(PROGRAMS "${PATH_MENSIA}/openvibe-driver-mensia-acquisition.dll" DESTINATION "bin") INSTALL(DIRECTORY "${PATH_MENSIA}/" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}/" FILES_MATCHING PATTERN "*.dll")
ADD_DEFINITIONS(-DTARGET_HAS_ThirdPartyMensiaAcquisition) ADD_DEFINITIONS(-DTARGET_HAS_ThirdPartyMensiaAcquisition)
ELSE(PATH_MENSIA) ELSE(PATH_MENSIA)
MESSAGE(STATUS " FAILED to find Mensia Acquisition driver (optional)") MESSAGE(STATUS " FAILED to find Mensia Acquisition driver (optional)")
......
...@@ -21,6 +21,7 @@ IF(WIN32) ...@@ -21,6 +21,7 @@ IF(WIN32)
ENDIF(NOT LIB_ENOBIOAPI) ENDIF(NOT LIB_ENOBIOAPI)
INCLUDE_DIRECTORIES(${PATH_ENOBIOAPI}) INCLUDE_DIRECTORIES(${PATH_ENOBIOAPI})
INSTALL(DIRECTORY "${PATH_ENOBIOAPI}/../MSVC/" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}/" FILES_MATCHING PATTERN "*.dll")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_ENOBIOAPI} ) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_ENOBIOAPI} )
ADD_DEFINITIONS(-DTARGET_HAS_ThirdPartyEnobioAPI) ADD_DEFINITIONS(-DTARGET_HAS_ThirdPartyEnobioAPI)
......
...@@ -204,11 +204,6 @@ no_need_to_download_dependencies_runtime: ...@@ -204,11 +204,6 @@ no_need_to_download_dependencies_runtime:
FileWrite $0 "SET PATH=$INSTDIR\libvorbis\win32\bin\release;$INSTDIR\libvorbis\win32\bin\debug;%PATH%$\r$\n" FileWrite $0 "SET PATH=$INSTDIR\libvorbis\win32\bin\release;$INSTDIR\libvorbis\win32\bin\debug;%PATH%$\r$\n"
FileWrite $0 "SET PATH=$INSTDIR\liblsl\lib\;%PATH%$\r$\n" FileWrite $0 "SET PATH=$INSTDIR\liblsl\lib\;%PATH%$\r$\n"
; Driver dependencies
FileWrite $0 "SET PATH=$INSTDIR\sdk-mensia-acquisition-driver\;%PATH%$\r$\n"
FileWrite $0 "SET PATH=$INSTDIR\sdk-enobio3g\MSVC\;%PATH%$\r$\n"
FileClose $0 FileClose $0
; Package configuration ; Package configuration
...@@ -287,7 +282,6 @@ Section "Uninstall" ...@@ -287,7 +282,6 @@ Section "Uninstall"
RMDir /r "$INSTDIR\openal" RMDir /r "$INSTDIR\openal"
RMDir /r "$INSTDIR\pthreads" RMDir /r "$INSTDIR\pthreads"
RMDir /r "$INSTDIR\vrpn" RMDir /r "$INSTDIR\vrpn"
RMDir /r "$INSTDIR\sdk-*"
Delete "$INSTDIR\..\scripts\win32-dependencies.cmd" Delete "$INSTDIR\..\scripts\win32-dependencies.cmd"
......
...@@ -122,7 +122,7 @@ no_need_to_install_directx: ...@@ -122,7 +122,7 @@ no_need_to_install_directx:
ZipDLL::extractall "arch\ov-dependencies-1.2.0-vc120-runtime.zip" "" ZipDLL::extractall "arch\ov-dependencies-1.2.0-vc120-runtime.zip" ""
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
; Export binaries (except the mensia acquisition dll, it will be installed optionally as part of neurort drivers choice) ; Export binaries
File /nonfatal /r ..\dist\bin File /nonfatal /r ..\dist\bin
; Export launch scripts ; Export launch scripts
File /nonfatal ..\dist\*.cmd File /nonfatal ..\dist\*.cmd
...@@ -169,7 +169,6 @@ no_need_to_patch_3d_functionnality: ...@@ -169,7 +169,6 @@ no_need_to_patch_3d_functionnality:
FileWrite $0 "SET PATH=$INSTDIR\dependencies\libvorbis\win32\bin\release;%PATH%$\r$\n" FileWrite $0 "SET PATH=$INSTDIR\dependencies\libvorbis\win32\bin\release;%PATH%$\r$\n"
FileWrite $0 "SET PATH=$INSTDIR\dependencies\libogg\win32\bin\release\;%PATH%$\r$\n" FileWrite $0 "SET PATH=$INSTDIR\dependencies\libogg\win32\bin\release\;%PATH%$\r$\n"
FileWrite $0 "SET PATH=$INSTDIR\dependencies\liblsl\lib\;%PATH%$\r$\n" FileWrite $0 "SET PATH=$INSTDIR\dependencies\liblsl\lib\;%PATH%$\r$\n"
FileWrite $0 "SET PATH=$INSTDIR\dependencies\enobio3g\MSVC\;%PATH%$\r$\n"
FileClose $0 FileClose $0
FileOpen $0 "$INSTDIR\dependencies\cegui\resources.cfg" w FileOpen $0 "$INSTDIR\dependencies\cegui\resources.cfg" w
......
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