diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d778c0..ec8645a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -168,5 +168,8 @@ elseif(MINGW OR MSVC) set(CPACK_GENERATOR ZIP;NSIS) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ybcon.exe DESTINATION bin) endif() -set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CMAKE_SYSTEM_PROCESSOR}") +if (NOT DEFINED CXX_TARGET) + set(CXX_TARGET ${CMAKE_HOST_SYSTEM_PROCESSOR}) +endif() +set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CXX_TARGET}") include(CPack) \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index a138f11..36a1231 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ def buildTarget(String path, String rpmArch, String debArch) { - cmakeBuild buildDir: "cmake-build-${debArch}", buildType: 'release', cleanBuild: true, installation: 'Main' - cmake arguments: "--build ./cmake-build-${debArch} --target ybcon", installation: 'Main', - cmakeArgs: "-DCMAKE_C_COMPILER=/usr/bin/${path}-gcc -DCMAKE_CXX_COMPILER=/usr/bin/${path}-g++ -DCMAKE_LINKER=/usr/bin/${path}-ld.gold -DCMAKE_AR=/usr/bin/${path}-ar -DCPACK_RPM_PACKAGE_ARCHITECTURE=${rpmArch} -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=${debArch}" + cmakeBuild buildDir: "cmake-build-${debArch}", buildType: 'release', cleanBuild: true, installation: 'Main', + cmakeArgs: "-DCMAKE_C_COMPILER=/usr/bin/${path}-gcc -DCMAKE_CXX_COMPILER=/usr/bin/${path}-g++ -DCMAKE_LINKER=/usr/bin/${path}-ld.gold -DCMAKE_AR=/usr/bin/${path}-ar -DCPACK_RPM_PACKAGE_ARCHITECTURE=${rpmArch} -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=${debArch} -DCXX_TARGET=${debArch}" + cmake arguments: "--build ./cmake-build-${debArch} --target ybcon", installation: 'Main' cpack installation: 'Main', workingDir: "cmake-build-${debArch}" }