Commit bffabbc6 authored by Jussi Lindgren's avatar Jussi Lindgren

Build: Minor fixes

- Fixed the install of gtk theme files on Windows
- Changed Designer application name
parent 12666bec
......@@ -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()
......
......@@ -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
......
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