compiler options

ERGO-Code · May 20, 2024 · a778542 · a778542
1 parent 043b809
commit a778542
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/.github/workflows/test-fortran-macos.yml b/.github/workflows/test-fortran-macos.yml
@@ -10,7 +10,6 @@ jobs:
         os: [macos-latest]
         toolchain:
           - {compiler: gcc, version: 13}
-          - {compiler: intel-classic, version: '2021.10'}
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/test-fortran-ubuntu.yml b/.github/workflows/test-fortran-ubuntu.yml
@@ -11,7 +11,6 @@ jobs:
         toolchain:
           - {compiler: gcc, version: 13}
           - {compiler: intel, version: '2023.2'}
-          - {compiler: intel-classic, version: '2021.10'}
           - {compiler: nvidia-hpc, version: '23.11'}
         include:
           - os: ubuntu-latest

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -19,7 +19,7 @@ if(FAST_BUILD)
       $<BUILD_INTERFACE:${HIGHS_SOURCE_DIR}/app>
     )
 
-    if(UNIX)
+    if(UNIX AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "NVHPC")
       target_compile_options(highs-bin PUBLIC "-Wno-unused-variable")
       target_compile_options(highs-bin PUBLIC "-Wno-unused-const-variable")
     endif()