master #13
@@ -15,6 +15,9 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
|
|||||||
if(NOT DEFINED BUILD_NUMBER)
|
if(NOT DEFINED BUILD_NUMBER)
|
||||||
set(BUILD_NUMBER 9999)
|
set(BUILD_NUMBER 9999)
|
||||||
endif()
|
endif()
|
||||||
|
if("x${BUILD_NUMBER}" STREQUAL "x")
|
||||||
|
set(BUILD_NUMBER 0)
|
||||||
|
endif()
|
||||||
set(_COMPANY SHS)
|
set(_COMPANY SHS)
|
||||||
set(_DOMAIN org.SHS)
|
set(_DOMAIN org.SHS)
|
||||||
include_directories(${CMAKE_CURRENT_BINARY_DIR}/pip)
|
include_directories(${CMAKE_CURRENT_BINARY_DIR}/pip)
|
||||||
|
|||||||
6
Jenkinsfile
vendored
6
Jenkinsfile
vendored
@@ -5,7 +5,11 @@ def build_docker(name) {
|
|||||||
if (env.DOCKER_PREFIX) {
|
if (env.DOCKER_PREFIX) {
|
||||||
pref = "--build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/"
|
pref = "--build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/"
|
||||||
}
|
}
|
||||||
def args = "${pref} --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER} --build-arg JOBS_COUNT=4"
|
def jobs = 4
|
||||||
|
if (env.JOBS_COUNT) {
|
||||||
|
jobs = "${env.JOBS_COUNT}"
|
||||||
|
}
|
||||||
|
def args = "${pref} --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER} --build-arg JOBS_COUNT=${jobs}"
|
||||||
dir ("docker/${image}") {
|
dir ("docker/${image}") {
|
||||||
//echo "build ${image} ${args}"
|
//echo "build ${image} ${args}"
|
||||||
sh "docker build ${args} --no-cache -t ${image} ."
|
sh "docker build ${args} --no-cache -t ${image} ."
|
||||||
|
|||||||
2
pip
2
pip
Submodule pip updated: e85275c587...b07fe9f892
@@ -25,8 +25,8 @@ set_version(${PROJECT_NAME}
|
|||||||
MAJOR ${_QCD_MAJOR}
|
MAJOR ${_QCD_MAJOR}
|
||||||
MINOR ${_QCD_MINOR}
|
MINOR ${_QCD_MINOR}
|
||||||
REVISION ${_QCD_REVISION}
|
REVISION ${_QCD_REVISION}
|
||||||
BUILD ${BUILD_NUMBER}
|
BUILD "${BUILD_NUMBER}"
|
||||||
SUFFIX ${_QCD_SUFFIX})
|
SUFFIX "${_QCD_SUFFIX}")
|
||||||
|
|
||||||
find_package(QAD REQUIRED)
|
find_package(QAD REQUIRED)
|
||||||
list(APPEND QT_MULTILIB_LIST ${PROJECT_NAME})
|
list(APPEND QT_MULTILIB_LIST ${PROJECT_NAME})
|
||||||
|
|||||||
@@ -1,10 +1,5 @@
|
|||||||
project(cd_pult)
|
project(cd_pult)
|
||||||
set_version(${PROJECT_NAME}
|
import_version(${PROJECT_NAME} qcd_utils)
|
||||||
MAJOR ${_QCD_MAJOR}
|
|
||||||
MINOR ${_QCD_MINOR}
|
|
||||||
REVISION ${_QCD_REVISION}
|
|
||||||
BUILD ${BUILD_NUMBER}
|
|
||||||
SUFFIX ${_QCD_SUFFIX})
|
|
||||||
find_qt(${QtVersions} Core Gui OpenGL)
|
find_qt(${QtVersions} Core Gui OpenGL)
|
||||||
set_deploy_property(${PROJECT_NAME}
|
set_deploy_property(${PROJECT_NAME}
|
||||||
LABEL ${PROJECT_NAME}
|
LABEL ${PROJECT_NAME}
|
||||||
|
|||||||
Reference in New Issue
Block a user