From 2c5b8d31214f2859724972355b8954076f3f1b31 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 31 Jul 2013 12:21:49 -0700 Subject: [PATCH] cmake source is root, make specific target --- interface/external/fervor/CMakeLists.txt | 2 -- jenkins/jobs.groovy | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/interface/external/fervor/CMakeLists.txt b/interface/external/fervor/CMakeLists.txt index 84d059b95c..a8b37ba9d0 100644 --- a/interface/external/fervor/CMakeLists.txt +++ b/interface/external/fervor/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 2.8) project(Fervor) -set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{QT_CMAKE_PREFIX_PATH}) - find_package(Qt5Core REQUIRED) find_package(Qt5Network REQUIRED) find_package(Qt5WebKit REQUIRED) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index 5acf313a9a..a7be662df6 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -81,12 +81,12 @@ def hifiJob(String targetName, Boolean deploy) { static Closure cmakeBuild(srcDir, instCommand) { return { project -> project / 'builders' / 'hudson.plugins.cmake.CmakeBuilder' { - sourceDir srcDir + sourceDir '.' buildDir 'build' installDir '' buildType 'RelWithDebInfo' generator 'Unix Makefiles' - makeCommand 'make' + makeCommand "make ${srcDir}" installCommand instCommand preloadScript '' cmakeArgs ''