Commit 3732556d authored by Jussi Lindgren's avatar Jussi Lindgren

Merge branch 'tweak-juli-for-release20' of gitlab.inria.fr:openvibe/extras...

Merge branch 'tweak-juli-for-release20' of gitlab.inria.fr:openvibe/extras into wip-all-openvibe20-base
parents 82f01112 bffabbc6
#
# Disabled until it behaves gracefully on a system without Python dll
#
RETURN()
PROJECT(openvibe-py2-check)
SET(PROJECT_VERSION_MAJOR ${OV_GLOBAL_VERSION_MAJOR})
......
......@@ -91,7 +91,7 @@ if(INSTALL_DESIGNER)
set(MATCH_EXPR "(Designer_WebBrowserHelpURLBase *= *\\$\{[^\}]+\}/documentation)/[\\.0-9a-zA-Z]+\n")
string(REGEX REPLACE ${MATCH_EXPR} "\\1/${OV_GLOBAL_VERSION_STRING}\n" FILE_CONTENT ${FILE_CONTENT})
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/designer.conf_${OUTPUTCONFIG} ${FILE_CONTENT})
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/designer.conf_${OUTPUTCONFIG} "Application_Name = Designer\nApplication_Version = ${OV_GLOBAL_VERSION_STRING}\nAcquisitionServer_HostName = localhost\n")
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/designer.conf_${OUTPUTCONFIG} "Application_Name = OpenViBE Designer\nApplication_Version = ${OV_GLOBAL_VERSION_STRING}\nAcquisitionServer_HostName = localhost\n")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/designer.conf_${OUTPUTCONFIG}" DESTINATION "${DIST_DATADIR}/openvibe/applications/designer" RENAME designer.conf CONFIGURATIONS ${OUTPUTCONFIG})
endif()
endforeach()
......@@ -118,7 +118,7 @@ if(INSTALL_DESIGNER)
set(MATCH_EXPR "(Designer_WebBrowserHelpURLBase *= *\\$\{[^\}]+\}/documentation)/[\\.0-9a-zA-Z]+\n")
string(REGEX REPLACE ${MATCH_EXPR} "\\1/${OV_GLOBAL_VERSION_STRING}\n" FILE_CONTENT ${FILE_CONTENT})
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/designer.conf ${FILE_CONTENT})
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/designer.conf "Application_Name = Designer\nApplication_Version = ${OV_GLOBAL_VERSION_STRING}\nAcquisitionServer_HostName = localhost\n")
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/designer.conf "Application_Name = OpenViBE Designer\nApplication_Version = ${OV_GLOBAL_VERSION_STRING}\nAcquisitionServer_HostName = localhost\n")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/designer.conf DESTINATION "${DIST_DATADIR}/openvibe/applications/designer")
endif()
endif()
......
......@@ -22,9 +22,12 @@ IF(PythonLibs_FOUND)
# TARGET_LINK_LIBRARIES(${PROJECT_NAME} optimized ${PYTHON_LIB})
# ENDFOREACH(PYTHON_LIB)
# TARGET_LINK_LIBRARIES(${PROJECT_NAME} optimized Delayimp )
# SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES LINK_FLAGS "/DELAYLOAD:python27.dll")
IF(WIN32)
# These are needed not to cause a popup on machines missing the dll
TARGET_LINK_LIBRARIES(${PROJECT_NAME} optimized Delayimp )
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES LINK_FLAGS "/DELAYLOAD:python27.dll")
ENDIF()
ADD_DEFINITIONS(-DTARGET_HAS_ThirdPartyPython)
ELSE()
OV_PRINT(OV_PRINTED " FAILED to find Python")
......
......@@ -32,6 +32,7 @@ private:
#ifdef TARGET_OS_Windows
bool CPythonInitializer::checkPythonPath()
{
#ifdef HAVE_WORKING_PYCHECK
const OpenViBE::CString testCmd = "\"" + OpenViBE::Directories::getBinDir() + "\\openvibe-py2-check.exe\"";
if (std::system(testCmd.toASCIIString()))
{
......@@ -40,8 +41,9 @@ bool CPythonInitializer::checkPythonPath()
std::cout << "Disabling the Python scripting box for now." << std::endl;
return false;
}
#endif
std::string l_sPath = Py_GetPath();
int found;
found = l_sPath.find_first_of(";");
while(found != std::string::npos)
......
......@@ -42,12 +42,11 @@
<ul>
<li><a href="http://openvibe.inria.fr">OpenViBE Home</a></li>
<li><a href="http://openvibe.inria.fr/forum">Forum</a></li>
<li><a href="http://gforge.inria.fr/projects/openvibe">Code Repository</a></li>
<li><a href="http://gitlab.inria.fr/openvibe">Code Repository</a></li>
<li><a href="http://openvibe.inria.fr/tracker">Bugtracker</a></li>
</ul>
<h2>Contact</h2>
<ul>
<li><b>IRC</b> : #openvibe @ irc.freenode.net</li>
<li><a href="http://openvibe.inria.fr/Contact"><b>Project Contact</b></a></li>
</ul>
</ul>
......
......@@ -53,6 +53,6 @@ SET_BUILD_PLATFORM()
# Install files
# -----------------------------
INSTALL(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION ${DIST_BINDIR}
LIBRARY DESTINATION ${DIST_LIBDIR}
ARCHIVE DESTINATION ${DIST_LIBDIR})
......@@ -10,6 +10,7 @@ SET VRPNROOT=%dependencies_base%\vrpn
SET PATH=%VRPNROOT%\bin;%PATH%
SET PATH=%dependencies_base%\vcredist-100\;%PATH%
SET PATH=%dependencies_base%\vcredist-110\;%PATH%
SET PATH=%dependencies_base%\vcredist\;%PATH%
REM Apply user-provided Python2.7 paths if available
......
......@@ -172,9 +172,12 @@ no_need_to_install_directx:
; Export launch scripts
File /nonfatal ..\..\dist\extras-Release\*.cmd
; File /nonfatal /r ..\dist\doc
; File /nonfatal /r ..\dist\etc
; File /nonfatal /r ..\dist\include
; File /nonfatal /r ..\dist\lib
; etc and lib folders are needed for the gtk theme
File /nonfatal /r /x *.lib ..\..\dist\extras-Release\lib
File /nonfatal /r ..\..\dist\extras-Release\etc
File /nonfatal /r ..\..\dist\extras-Release\log
File /nonfatal /r ..\..\dist\extras-Release\share
; File /nonfatal /r ..\dist\tmp
......
......@@ -4,8 +4,8 @@ build/windows/cegui-0.8.4-runtime.zip;cegui;0.8.4
build/windows/cmake-3.4.0.zip;cmake;3.4.0
build/windows/eigen-3.2.0.zip;eigen;3.2.0
build/windows/freealut-1.1.0.zip;freealut;1.1.0
build/windows/gtk_2.24.31_x86_vc120_dev.zip;gtk;2.24.31
build/windows/gtk_2.24.31_x86_vc120_runtime.zip;gtk;2.24.31
build/windows/gtk-2.22.1-dev.zip;gtk;2.22.1
build/windows/gtk-2.22.1-runtime.zip;gtk;2.22.1
build/windows/itpp-4.3.1.zip;itpp;4.3.1
build/windows/liblsl-1.05.zip;liblsl;1.05
build/windows/libogg-1.2.1.zip;libogg;1.2.1
......@@ -16,7 +16,7 @@ build/windows/ogre-1.9.0-dev.zip;ogre;1.9.0
build/windows/ogre-1.9.0-runtime.zip;ogre;1.9.0
build/windows/openal-1.1.zip;openal;1.1
build/windows/pthread_2.9.1_x86_vc120_dev.zip;pthread;2.9.1
build/windows/sdk-brainproducts-actichamp.zip;sdk-brainproducts;actichamp;0.0.0
build/windows/sdk-brainproducts-actichamp.zip;sdk-brainproducts-actichamp;0.0.0
build/windows/sdk-brainproducts-liveamp.zip;sdk-brainproducts-liveamp;0.0.0
build/windows/sdk-eemagine-eego.zip;sdk-eemagine-eego;0.0.0
build/windows/sdk-enobio3g.zip;sdk-enobio3g;0.0.0
......@@ -29,4 +29,5 @@ build/windows/sdk-tmsi.zip;sdk-tmsi;0.0.0
build/windows/vrpn-7.31-dev.zip;vrpn;7.31
build/windows/vrpn-7.31-runtime.zip;vrpn;7.31
build/windows/vcredist_x86_vc100.zip;vcredist-100;1.0
build/windows/vcredist_x86_vc110.zip;vcredist-110;1.0
build/windows/vcredist_x86_vc120.zip;vcredist;1.0
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