diff --git a/CMakeLists.txt b/CMakeLists.txt index d15980dc4..f868548f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1143,14 +1143,14 @@ pragma_install(wgui "${BINARY_OUTPUT_DIR}") message("Custom install targets: ${PRAGMA_INSTALL_CUSTOM_TARGETS}") add_custom_target(pragma-install - DEPENDS pragma iclient iserver ${PRAGMA_INSTALL_CUSTOM_TARGETS} + DEPENDS pragma-install-full ${PRAGMA_INSTALL_CUSTOM_TARGETS} COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=${PRAGMA_INSTALL_COMPONENT} -DBUILD_TYPE=${CMAKE_BUILD_TYPE} -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" ) add_custom_target(pragma-install-full - DEPENDS pragma-install + DEPENDS pragma iclient iserver COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=${PRAGMA_INSTALL_COMPONENT_FULL} -DBUILD_TYPE=${CMAKE_BUILD_TYPE} diff --git a/build_scripts/build.py b/build_scripts/build.py index ae733251f..8cad6b6e6 100644 --- a/build_scripts/build.py +++ b/build_scripts/build.py @@ -985,15 +985,20 @@ def download_addon(name,addonName,url,commitId=None): print_msg("Building Pragma...") os.chdir(build_dir) - targets = ["pragma-install-full"] + + + print_msg("Running build command...") + cmake_build(build_config,["pragma-install-full"]) + targets = [] if with_pfm: targets.append("pfm") targets += additional_build_targets - targets.append("pragma-install") + #targets.append("pragma-install") - print_msg("Running build command...") cmake_build(build_config,targets) + cmake_build(build_config,["pragma-install"]) + diff --git a/build_scripts/scripts/shared.py b/build_scripts/scripts/shared.py index a7ed2ae73..e01e95b62 100644 --- a/build_scripts/scripts/shared.py +++ b/build_scripts/scripts/shared.py @@ -7,6 +7,7 @@ import tarfile import urllib.request import zipfile +import multiprocessing from pathlib import Path from urllib.parse import urlparse from sys import platform @@ -78,6 +79,8 @@ def cmake_build(buildConfig,targets=None): if targets: args.append("--target") args += targets + args.append("--parallel") + args.append(multiprocessing.cpu_count()) subprocess.run(args,check=True) def mkdir(dirName,cd=False):