Skip to content

Commit cf96361

Browse files
committed
Unify install RPATH across coverage and non-coverage CMake paths
1 parent 9c98030 commit cf96361

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/ubuntu.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,13 @@ jobs:
367367
cmake -S . -B build -G Ninja
368368
-D CMAKE_BUILD_TYPE=RELEASE
369369
-D CMAKE_VERBOSE_MAKEFILE=ON -D USE_COVERAGE=ON
370+
-DCMAKE_INSTALL_PREFIX=install
370371
- name: Build project
371372
run: |
372373
cmake --build build --parallel -- --quiet
374+
- name: Install project
375+
run: |
376+
cmake --build build --target install -- --quiet
373377
- name: Run tests (MPI)
374378
run: scripts/run_tests.py --running-type="processes" --additional-mpi-args="--oversubscribe"
375379
env:

cmake/configure.cmake

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@ set(CMAKE_COMPILE_WARNING_AS_ERROR ON)
4343

4444
option(USE_COVERAGE "Enable coverage instrumentation" OFF)
4545

46-
if(USE_COVERAGE)
47-
set(CMAKE_INSTALL_RPATH "${CMAKE_BINARY_DIR}/ppc_onetbb/install/lib")
48-
else()
49-
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
50-
endif()
46+
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
5147
set(CMAKE_BUILD_RPATH "${CMAKE_BINARY_DIR}/ppc_onetbb/install/lib")
5248

5349
set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF)

0 commit comments

Comments
 (0)