Make parallel optional

Author: sirknightj

.github/workflows/ci.yml

@@ -45,6 +45,14 @@ jobs:
 
   mac-os-build-gcc:
     runs-on: macos-13
+    strategy:
+      matrix:
+        parallel-build:
+          - ON
+          - OFF
+
+      fail-fast: false
+
     permissions:
       id-token: write
       contents: read
@@ -62,17 +70,25 @@ jobs:
       - name: Build repository
         run: |
           mkdir build && cd build
-          cmake .. -DBUILD_TEST=TRUE -DCMAKE_INSTALL_PREFIX=.
-          make
-          make install
+          cmake .. -DBUILD_TEST=TRUE -DCMAKE_INSTALL_PREFIX=. -DPARALLEL_BUILD=${{ matrix.parallel-build }}
+
+          if [[ "${{ matrix.parallel-build }}" == 'ON' ]]; then
+            make
+            make -j install
+          else
+            make
+            make install
+          fi
       - name: Configure AWS Credentials
+        if: ${{ matrix.parallel-build == 'ON' }} # Only need to run the tests once
         uses: aws-actions/configure-aws-credentials@v1-node16
         with:
           role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
           role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
           aws-region: ${{ secrets.AWS_REGION }}
           role-duration-seconds: 10800
       - name: Run tests
+        if: ${{ matrix.parallel-build == 'ON' }}
         run: |
           cd build
           ./tst/producerTest
@@ -242,6 +258,15 @@ jobs:
 
   ubuntu-gcc:
     runs-on: ubuntu-20.04
+
+    strategy:
+      matrix:
+        parallel-build:
+          - ON
+          - OFF
+
+      fail-fast: false
+
     env:
       AWS_KVS_LOG_LEVEL: 2
       CC: gcc
@@ -260,17 +285,24 @@ jobs:
       - name: Build repository
         run: |
           mkdir build && cd build
-          cmake .. -DBUILD_TEST=TRUE -DBUILD_GSTREAMER_PLUGIN=TRUE -DBUILD_JNI=TRUE -DCMAKE_INSTALL_PREFIX=.
-          make
-          make install
+          cmake .. -DBUILD_TEST=TRUE -DBUILD_GSTREAMER_PLUGIN=TRUE -DBUILD_JNI=TRUE -DCMAKE_INSTALL_PREFIX=. -DPARALLEL_BUILD=${{ matrix.parallel-build }}
+          
+          if [[ "${{ matrix.parallel-build }}" == 'ON' ]]; then
+            make -j install
+          else
+            make install
+          fi
+
       - name: Configure AWS Credentials
+        if: ${{ matrix.parallel-build == 'ON' }} # Only need to run the tests once
         uses: aws-actions/configure-aws-credentials@v1-node16
         with:
           role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
           role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
           aws-region: ${{ secrets.AWS_REGION }}
           role-duration-seconds: 10800
       - name: Run tests
+        if: ${{ matrix.parallel-build == 'ON' }}
         run: |
           cd build
           ulimit -c unlimited -S

CMake/Utilities.cmake

@@ -9,7 +9,7 @@ function(fetch_repo lib_name)
     return()
   endif()
 
-  if (WIN32)
+  if (WIN32 OR NOT PARALLEL_BUILD)
     set(PARALLEL_BUILD "")  # No parallel build for Windows
   else()
     set(PARALLEL_BUILD "--parallel")  # Enable parallel builds for Unix-like systems
@@ -81,7 +81,7 @@ function(build_dependency lib_name)
 
   file(REMOVE_RECURSE ${KINESIS_VIDEO_OPEN_SOURCE_SRC}/lib${lib_name})
 
-  if (WIN32)
+  if (WIN32 OR NOT PARALLEL_BUILD)
     set(PARALLEL_BUILD "")  # No parallel build for Windows
   else()
     set(PARALLEL_BUILD "--parallel")  # Enable parallel builds for Unix-like systems

CMakeLists.txt

@@ -17,6 +17,7 @@ option(ADD_MUCLIBC "Add -muclibc c flag" OFF)
 option(BUILD_DEPENDENCIES "Whether or not to build depending libraries from source" ON)
 option(BUILD_OPENSSL_PLATFORM "If buildng OpenSSL what is the target platform" OFF)
 option(BUILD_LOG4CPLUS_HOST "Specify host-name for log4cplus for cross-compilation" OFF)
+option(PARALLEL_BUILD "Build dependencies with parallel flag" ON)
 
 # Developer Flags
 option(BUILD_TEST "Build the testing tree" OFF)

README.md

@@ -237,6 +237,7 @@ You can pass the following additional CMake options:
 | Option	                      | Default       | Description	|
 |:-----------------------------|:-------------:|:-------------|
 | BUILD_GSTREAMER_PLUGIN       | OFF           | Build the `kvssink` GStreamer plugin
+| PARALLEL_BUILD               | ON            | When building dependencies, use multiple CPU cores in parallel (speeds up the build). Not available in Windows.
 | BUILD_JNI                    | OFF           | Build C++ wrapper for JNI to expose the functionality to Java/Android
 | BUILD_JNI_ONLY               | OFF           | Build only the JNI. C++ Producer will not be built. Requires Java installed.
 | BUILD_DEPENDENCIES           | ON            | Build depending libraries from source