diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 4840290..fb43b48 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -22,7 +22,7 @@ jobs: asan: [ YES, NO ] runs-on: ${{ matrix.os }} - name: Build with external_gtest=${{ matrix.external-gtest }} on ${{ matrix.os }} + name: Build with external_gtest=${{ matrix.external-gtest }} on ${{ matrix.os }} and asan=${{ matrix.asan }} steps: - uses: actions/checkout@v1 @@ -45,7 +45,7 @@ jobs: # Note the current convention is to use the -S and -B options here to specify source # and build directories, but this is only available with CMake 3.13 and higher. # The CMake binaries on the Github Actions machines are (as of this writing) 3.12 - run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSCITOKENS_BUILD_UNITTESTS=yes -DSCITOKENS_EXTERNAL_GTEST=${{ matrix.external-gtest }} -DSCITOKENS_WITH_ASAN=${{ matrix.asan }} + run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSCITOKENS_BUILD_UNITTESTS=ON -DSCITOKENS_EXTERNAL_GTEST=${{ matrix.external-gtest }} -DSCITOKENS_WITH_ASAN=${{ matrix.asan }} - name: Build working-directory: ${{runner.workspace}}/build diff --git a/CMakeLists.txt b/CMakeLists.txt index b3e3c55..53de423 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,9 +6,9 @@ project( scitokens-cpp VERSION 1.0.2 LANGUAGES CXX) -option( SCITOKENS_BUILD_UNITTESTS "Build the scitokens-cpp unit tests" ON ) -option( SCITOKENS_EXTERNAL_GTEST " Use an external/pre-installed copy of GTest" OFF ) -option( SCITOKENS_WITH_ASAN "Build with the address santizier" OFF ) +option( SCITOKENS_BUILD_UNITTESTS "Build the scitokens-cpp unit tests" OFF ) +option( SCITOKENS_EXTERNAL_GTEST "Use an external/pre-installed copy of GTest" OFF ) +option( SCITOKENS_WITH_ASAN "Build with the address sanitizer" OFF ) set( CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}" )