Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:53:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #734 from birarda/qt5

Browse source 
switch cmake source for jenkins build to root
This commit is contained in:
Stephen Birarda 2013-07-31 12:28:28 -07:00
commit ffa3c5556c
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/external/fervor/CMakeLists.txt vendored
View file

@ -1,8 +1,6 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
project(Fervor) project(Fervor)
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{QT_CMAKE_PREFIX_PATH})
find_package(Qt5Core REQUIRED) find_package(Qt5Core REQUIRED)
find_package(Qt5Network REQUIRED) find_package(Qt5Network REQUIRED)
find_package(Qt5WebKit REQUIRED) find_package(Qt5WebKit REQUIRED)

4
jenkins/jobs.groovy
View file

@ -81,12 +81,12 @@ def hifiJob(String targetName, Boolean deploy) {
static Closure cmakeBuild(srcDir, instCommand) { static Closure cmakeBuild(srcDir, instCommand) {
return { project -> return { project ->
project / 'builders' / 'hudson.plugins.cmake.CmakeBuilder' { project / 'builders' / 'hudson.plugins.cmake.CmakeBuilder' {
sourceDir srcDir sourceDir '.'
buildDir 'build' buildDir 'build'
installDir '' installDir ''
buildType 'RelWithDebInfo' buildType 'RelWithDebInfo'
generator 'Unix Makefiles' generator 'Unix Makefiles'
makeCommand 'make' makeCommand "make ${srcDir}"
installCommand instCommand installCommand instCommand
preloadScript '' preloadScript ''
cmakeArgs '' cmakeArgs ''