Commit 7bfe142d authored by Jussi Lindgren's avatar Jussi Lindgren
Browse files

Build: Updated dependencies for VS2010 & VS2013

- The installers are now significantly simplified
- Re-enabled finding of ITPP and VRPN packages
- Removed remaining VS2008 items
- Minor cleanup
parent 8151ec16
......@@ -15,16 +15,42 @@
# ---------------------------------
IF(WIN32)
MESSAGE(STATUS "Disabling ITPP until recompiled with VC120 ...")
RETURN()
FIND_PATH(PATH_ITPP include/itpp/itbase.h PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/itpp)
IF(PATH_ITPP)
SET(ITPP_FOUND TRUE)
SET(ITPP_INCLUDE_DIRS ${PATH_ITPP}/include)
SET(ITPP_LIBRARIES libblas.a libfftw3-3 liblapack.a libgcc.a libg2c.a)
SET(ITPP_LIBRARIES_RELEASE itpp)
SET(ITPP_LIBRARIES_DEBUG itppd)
# Currently the different versions we package for different VS have a bit different lib names...
IF(${CMAKE_MAJOR_VERSION} LESS 3)
INCLUDE(CMakeDetermineVSServicePack)
DetermineVSServicePack( MSVC_SERVICE_PACK )
ELSE(${CMAKE_MAJOR_VERSION} LESS 3)
SET(MSVC_SERVICE_PACK "unknown")
IF(${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER "16.0.0")
SET(MSVC_SERVICE_PACK "vc100")
ENDIF()
IF(${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER "17.0.0")
SET(MSVC_SERVICE_PACK "vc110")
ENDIF()
IF(${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER "18.0.0")
SET(MSVC_SERVICE_PACK "vc120")
ENDIF()
ENDIF(${CMAKE_MAJOR_VERSION} LESS 3)
STRING(REGEX MATCH "vc100.*" MSVC_VER100 ${MSVC_SERVICE_PACK})
STRING(REGEX MATCH "vc120.*" MSVC_VER120 ${MSVC_SERVICE_PACK})
IF(MSVC_VER100)
SET(ITPP_LIBRARIES libblas.a libfftw3-3 liblapack.a libgcc.a libg2c.a)
SET(ITPP_LIBRARIES_RELEASE itpp)
SET(ITPP_LIBRARIES_DEBUG itppd)
ENDIF(MSVC_VER100)
IF(MSVC_VER120)
SET(ITPP_LIBRARIES libfftw3-3_win32)
SET(ITPP_LIBRARIES_RELEASE blas_win32_MT lapack_win32_MT itpp)
SET(ITPP_LIBRARIES_DEBUG blas_win32_MTd lapack_win32_MTd itppd)
ENDIF(MSVC_VER120)
SET(ITPP_LIBRARY_DIRS ${PATH_ITPP}/lib )
ENDIF(PATH_ITPP)
......
IF(WIN32)
FIND_PATH(PATH_MCS nvxmcs.dll PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/mcs/lib NO_DEFAULT_PATH)
FIND_PATH(PATH_MCS nvxmcs.dll PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/sdk-mcs/lib NO_DEFAULT_PATH)
ENDIF(WIN32)
IF(PATH_MCS)
......
......@@ -4,7 +4,7 @@
# Adds include path
# ---------------------------------
IF(WIN32)
SET(ENOBIOAPI_DIR ${OV_CUSTOM_DEPENDENCIES_PATH}/enobio3g/enobio3g)
SET(ENOBIOAPI_DIR ${OV_CUSTOM_DEPENDENCIES_PATH}/sdk-enobio3g/enobio3g)
FIND_PATH(PATH_ENOBIOAPI enobio3g.h PATHS ${ENOBIOAPI_DIR})
IF(NOT PATH_ENOBIOAPI)
......
......@@ -4,11 +4,6 @@
# ---------------------------------
# The first ${..}/vrpn path is for Windows, the second ${..}/ for Linux
IF(WIN32)
MESSAGE(STATUS "Disabling VRPN until recompiled with VC120 ...")
RETURN()
ENDIF(WIN32)
FIND_PATH(PATH_VRPN include/vrpn_BaseClass.h PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/vrpn ${OV_CUSTOM_DEPENDENCIES_PATH} NO_DEFAULT_PATH)
FIND_PATH(PATH_VRPN include/vrpn_BaseClass.h PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/vrpn ${OV_CUSTOM_DEPENDENCIES_PATH})
IF(PATH_VRPN)
......
......@@ -30,17 +30,10 @@ IF(WIN32)
SET(MSVC_SERVICE_PACK "vc120")
ENDIF()
ENDIF(${CMAKE_MAJOR_VERSION} LESS 3)
MESSAGE(STATUS "pack ${MSVC_SERVICE_PACK}")
SET(LIB_BOOST "unknown-platform-NOTFOUND")
SET(LIB_BOOST_DEBUG "unknown-platform-NOTFOUND")
STRING(REGEX MATCH "vc90.*" MSVC_VER90 ${MSVC_SERVICE_PACK})
IF(MSVC_VER90)
SET(LIB_BOOST "libboost_${BOOST_COMPONENT}-vc90-mt-${BOOST_VERSION}.lib")
SET(LIB_BOOST_DEBUG "libboost_${BOOST_COMPONENT}-vc90-mt-gd-${BOOST_VERSION}.lib")
ENDIF(MSVC_VER90)
STRING(REGEX MATCH "vc100.*" MSVC_VER100 ${MSVC_SERVICE_PACK})
IF(MSVC_VER100)
SET(LIB_BOOST "libboost_${BOOST_COMPONENT}-vc100-mt-${BOOST_VERSION}.lib")
......
......@@ -48,17 +48,10 @@ if exist "%VS100COMNTOOLS%vsvars32.bat" (
)
:VS2008
if exist "%VS90COMNTOOLS%vsvars32.bat" (
echo Found VS90 tools at "%VS90COMNTOOLS%" ...
CALL "%VS90COMNTOOLS%vsvars32.bat"
SET VSCMake=Visual Studio 9 2008
goto terminate
)
echo ######################################################################################
echo ## ##
echo ## ERROR : Microsoft Visual Studio Common tools initialisation script not found ##
echo ## for supported VS version (2010 or 2013) ##
echo ## ##
echo ######################################################################################
goto terminate
......
This diff is collapsed.
......@@ -110,52 +110,19 @@ Section "!OpenViBE" Section1
no_need_to_install_directx:
SetOutPath "$INSTDIR\dependencies\arch"
File ..\dependencies\arch\openvibe-vcredist-2010.exe
File ..\dependencies\arch\lua-5.1.4-vs100.zip
File ..\dependencies\arch\expat-2.0.1.zip
; File ..\dependencies\arch\glfw-3.0.4-vs100.zip
File ..\dependencies\arch\gtk-2.22.1-runtime.zip
File ..\dependencies\arch\gtk-themes-2009.09.07.zip
; File ..\dependencies\arch\inpout32-vs100.zip
File ..\dependencies\arch\itpp-4.0.7-runtime.zip
File ..\dependencies\arch\ogre-1.7.1-vs100-runtime.zip
File ..\dependencies\arch\cegui-0.7.2-vs100-runtime.zip
File ..\dependencies\arch\vrpn-7.31-vs100-runtime.zip
File ..\dependencies\arch\pthreads-2.8.0-runtime.zip
; File ..\dependencies\arch\presage-0.8.9-vs100.zip
File ..\dependencies\arch\openal-1.1-runtime.zip
File ..\dependencies\arch\freealut-1.1.0-bin-runtime.zip
File ..\dependencies\arch\libvorbis-1.3.2-vs100-runtime.zip
File ..\dependencies\arch\libogg-1.2.1-vs100-runtime.zip
File ..\dependencies\arch\liblsl-1.04-vs100-runtime.zip
File ..\dependencies\arch\enobio3g-1.2.1-vs100-runtime.zip
SetOutPath "$INSTDIR\dependencies"
ExecWait '"arch\openvibe-vcredist-2010.exe" /q'
File "..\dependencies\arch\ov-dependencies-1.2.0-vc120-runtime.zip"
File "..\dependencies\arch\vcredist-2010.exe"
File "..\dependencies\arch\vcredist-2013_x86.exe"
ExecWait '"arch\vcredist-2010.exe" /q'
ExecWait '"arch\vcredist-2013_x86.exe" /install /quiet'
SetOutPath "$INSTDIR\dependencies"
ZipDLL::extractall "arch\lua-5.1.4-vs100.zip" ""
ZipDLL::extractall "arch\expat-2.0.1.zip" "expat"
; ZipDLL::extractall "arch\glfw-3.0.4-vs100.zip" ""
ZipDLL::extractall "arch\gtk-2.22.1-runtime.zip" "gtk"
ZipDLL::extractall "arch\gtk-themes-2009.09.07.zip" "gtk"
; ZipDLL::extractall "arch\inpout32-vs100.zip" ""
ZipDLL::extractall "arch\itpp-4.0.7-runtime.zip" "itpp"
ZipDLL::extractall "arch\ogre-1.7.1-vs100-runtime.zip" "ogre"
ZipDLL::extractall "arch\cegui-0.7.2-vs100-runtime.zip" "cegui"
ZipDLL::extractall "arch\vrpn-7.31-vs100-runtime.zip" ""
ZipDLL::extractall "arch\pthreads-2.8.0-runtime.zip" "pthreads"
; ZipDLL::extractall "arch\presage-0.8.9-vs100.zip" ""
ZipDLL::extractall "arch\openal-1.1-runtime.zip" "openal"
ZipDLL::extractall "arch\freealut-1.1.0-bin-runtime.zip" "freealut"
ZipDLL::extractall "arch\libvorbis-1.3.2-vs100-runtime.zip" "libvorbis"
ZipDLL::extractall "arch\libogg-1.2.1-vs100-runtime.zip" "libogg"
ZipDLL::extractall "arch\liblsl-1.04-vs100-runtime.zip" "liblsl"
ZipDLL::extractall "arch\enobio3g-1.2.1-vs100-runtime.zip" ""
ZipDLL::extractall "arch\ov-dependencies-1.2.0-vc120-runtime.zip" ""
SetOutPath "$INSTDIR"
; Export binaries (except the mensia acquisition dll, it will be installed optionally as part of neurort drivers choice)
File /nonfatal /r /x openvibe-driver-mensia-acquisition.dll ..\dist\bin
File /nonfatal /r ..\dist\bin
; Export launch scripts
File /nonfatal ..\dist\*.cmd
; File /nonfatal /r ..\dist\doc
......@@ -189,15 +156,13 @@ no_need_to_patch_3d_functionnality:
FileWrite $0 "SET PATH=$INSTDIR\dependencies\lua\lib;%PATH%$\r$\n"
FileWrite $0 "SET PATH=$INSTDIR\dependencies\itpp\bin;%PATH%$\r$\n"
FileWrite $0 "SET PATH=$INSTDIR\dependencies\expat\bin;%PATH%$\r$\n"
; FileWrite $0 "SET PATH=$INSTDIR\dependencies\glfw\lib\;%PATH%$\r$\n"
FileWrite $0 "SET PATH=$INSTDIR\dependencies\gtk\bin;%PATH%$\r$\n"
; FileWrite $0 "SET PATH=$INSTDIR\dependencies\inpout32\lib;%PATH%$\r$\n"
FileWrite $0 "SET PATH=$INSTDIR\dependencies\itpp\bin;%PATH%$\r$\n"
FileWrite $0 "SET PATH=$INSTDIR\dependencies\cegui\bin;%PATH%$\r$\n"
FileWrite $0 "SET PATH=$INSTDIR\dependencies\cegui\dependencies\bin;%PATH%$\r$\n"
FileWrite $0 "SET PATH=%OGRE_HOME%\bin\release;%OGRE_HOME%\bin\debug;%PATH%$\r$\n"
FileWrite $0 "SET PATH=%VRPNROOT%\bin;%PATH%$\r$\n"
FileWrite $0 "SET PATH=$INSTDIR\dependencies\pthreads\lib;%PATH%$\r$\n"
;FileWrite $0 "SET PATH=$INSTDIR\dependencies\presage\lib;%PATH%$\r$\n"
FileWrite $0 "SET PATH=$INSTDIR\dependencies\openal\libs\Win32;%PATH%$\r$\n"
FileWrite $0 "SET PATH=$INSTDIR\dependencies\freealut\lib;%PATH%$\r$\n"
FileWrite $0 "SET PATH=$INSTDIR\dependencies\libvorbis\win32\bin\release;%PATH%$\r$\n"
......@@ -243,27 +208,6 @@ no_need_to_patch_3d_functionnality:
; AccessControl::GrantOnFile "$INSTDIR" "(S-1-5-32-545)" "GenericRead + GenericWrite + GenericExecute + Delete" ; (BU) user group (builtin users) does not exist on win7. this SID replaces it.
SectionEnd
Section "Mensia NeuroRT drivers" Section2
CreateDirectory "$INSTDIR\dependencies\arch"
SetOutPath "$INSTDIR\dependencies"
NSISdl::download "http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe" "arch\vcredist_2013_x86.exe"
Pop $R0 ; Get the return value
StrCmp $R0 "success" +3
MessageBox MB_OK "Download failed: $R0$\nCheck your Internet connection and your firewall settings.$\nNeuroRT driver collection wont be installed...$\n" /SD IDOK
Goto skip_mensia_acquisition
ExecWait '"arch\vcredist_2013_x86.exe" /install /quiet'
SetOutPath "$INSTDIR\dependencies\arch"
File ..\dependencies\arch\sdk-mensia-acquisition-driver-vs120-20150925.zip
SetOutPath "$INSTDIR\dependencies"
ZipDLL::extractall "arch\sdk-mensia-acquisition-driver-vs120-20150925.zip" "$INSTDIR\bin"
skip_mensia_acquisition:
SectionEnd
Section "Uninstall"
RMDir /r $INSTDIR
......@@ -272,10 +216,8 @@ Section "Uninstall"
SectionEnd
LangString DESC_Section1 ${LANG_ENGLISH} "The OpenViBE package: Designer, Acquisition Server, drivers, examples, etc."
LangString DESC_Section2 ${LANG_ENGLISH} "Mensia NeuroRT driver library. Adds support for Brain Rhythm 8, Simulator, SmartBCI and Wearable Sensing Dry Sensor Interface. Visual Studio 2013 redistributable will be installed."
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1)
!insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
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