diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-10-09 20:54:19 +0800 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-09 05:54:19 -0700 |
| commit | 37be706f568f07b1507e7e1717a9bc4910747a61 (patch) | |
| tree | b43721d222a56611e9f6bcee95d5c043bb4940f4 /scripts | |
| parent | 0de501a3f460f0f27c266b6e77ca22a6e3e597c8 (diff) | |
| download | vcpkg-37be706f568f07b1507e7e1717a9bc4910747a61.tar.gz vcpkg-37be706f568f07b1507e7e1717a9bc4910747a61.zip | |
Fix option -j (#8489)
* Remove unusable parameters -j
* trigger CI system.
* Add option -j to make.
* Re-trigger CI system.
* Fix -j in make, fix NO_DEBUG in nmake.
* Re-trigger CI system.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_build_make.cmake | 12 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_build_nmake.cmake | 4 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_install_nmake.cmake | 6 |
3 files changed, 13 insertions, 9 deletions
diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index f73fb98d5..793341655 100644 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -52,17 +52,17 @@ function(vcpkg_build_make) set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH};${MSYS_ROOT}/usr/bin;${PERL_EXE_PATH}")
set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
# Set make command and install command
- set(MAKE ${BASH} --noprofile --norc -c)
+ set(MAKE ${BASH} --noprofile --norc -c "${_VCPKG_PROJECT_SUBPATH}make")
# Must use absolute path to call make in windows
- set(MAKE_OPTS "${_VCPKG_PROJECT_SUBPATH}make")
- set(INSTALL_OPTS "${_VCPKG_PROJECT_SUBPATH}make install")
+ set(MAKE_OPTS "-j ${VCPKG_CONCURRENCY}")
+ set(INSTALL_OPTS "install -j ${VCPKG_CONCURRENCY}")
else()
# Compiler requriements
find_program(MAKE make REQUIRED)
set(MAKE make)
# Set make command and install command
- set(MAKE_OPTS)
- set(INSTALL_OPTS install)
+ set(MAKE_OPTS -j ${VCPKG_CONCURRENCY})
+ set(INSTALL_OPTS install -j ${VCPKG_CONCURRENCY})
endif()
elseif (_VCPKG_MAKE_GENERATOR STREQUAL "nmake")
find_program(NMAKE nmake REQUIRED)
@@ -121,7 +121,7 @@ function(vcpkg_build_make) endif()
vcpkg_execute_build_process(
- COMMAND ${MAKE} -j ${VCPKG_CONCURRENCY} ${MAKE_OPTS}
+ COMMAND ${MAKE} ${MAKE_OPTS}
WORKING_DIRECTORY ${WORKING_DIRECTORY}
LOGNAME "${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}${SHORT_BUILDTYPE}"
)
diff --git a/scripts/cmake/vcpkg_build_nmake.cmake b/scripts/cmake/vcpkg_build_nmake.cmake index c98df946a..1eb621b0e 100644 --- a/scripts/cmake/vcpkg_build_nmake.cmake +++ b/scripts/cmake/vcpkg_build_nmake.cmake @@ -171,8 +171,8 @@ function(vcpkg_build_nmake) message(STATUS "Building and installing ${CURRENT_TRIPLET_NAME}")
endif()
- vcpkg_execute_required_process(
- COMMAND ${MAKE} -j ${VCPKG_CONCURRENCY} ${MAKE_OPTS}
+ vcpkg_execute_build_process(
+ COMMAND ${MAKE} ${MAKE_OPTS}
WORKING_DIRECTORY ${OBJ_DIR}${_bn_PROJECT_SUBPATH}
LOGNAME "${_bn_LOGFILE_ROOT}-${CURRENT_TRIPLET_NAME}"
)
diff --git a/scripts/cmake/vcpkg_install_nmake.cmake b/scripts/cmake/vcpkg_install_nmake.cmake index ca7fe6ce5..0674f9ec3 100644 --- a/scripts/cmake/vcpkg_install_nmake.cmake +++ b/scripts/cmake/vcpkg_install_nmake.cmake @@ -61,8 +61,12 @@ function(vcpkg_install_nmake) message(FATAL_ERROR "vcpkg_install_nmake only support windows.")
endif()
+ if (_in_NO_DEBUG)
+ set(NO_DEBUG NO_DEBUG)
+ endif()
+
vcpkg_build_nmake(LOGFILE_ROOT ENABLE_INSTALL
- ${_in_NO_DEBUG}
+ ${NO_DEBUG}
SOURCE_PATH ${_in_SOURCE_PATH} PROJECT_SUBPATH ${_in_PROJECT_SUBPATH} PROJECT_NAME ${_in_PROJECT_NAME}
OPTIONS ${_in_OPTIONS} OPTIONS_RELEASE ${_in_OPTIONS_RELEASE} OPTIONS_DEBUG ${_in_OPTIONS_DEBUG}
)
|