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.
microsoft · Oct 9, 2019 · 37be706 · 37be706
1 parent 0de501a
commit 37be706
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/ports/freexl/CONTROL b/ports/freexl/CONTROL
@@ -1,5 +1,5 @@
 Source: freexl
-Version: 1.0.4-6
+Version: 1.0.4-7
 Homepage: https://www.gaia-gis.it/gaia-sins/freexl-sources
 Description: FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet
 Build-Depends: libiconv
diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL
@@ -1,4 +1,4 @@
 Source: x264
-Version: 157-303c484ec828ed0-3
+Version: 157-303c484ec828ed0-4
 Homepage: https://github.com/mirror/x264
 Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format
diff --git 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
@@ -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
@@ -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}
     )