Skip to content

Commit

Permalink
build: set CMAKE_INSTALL_LIBDIR to flux-core libdir
Browse files Browse the repository at this point in the history
Problem: If flux-core was configured with a different libdir, then
Fluxion modules can't be found by default.

Ensure that CMAKE_INSTALL_LIBDIR matches the flux-core libdir by
using FLUX_CORE_LIBDIR when flux-core is found by pkgconfig.

Fixes #1092
  • Loading branch information
grondo committed Oct 2, 2023
1 parent 0ea1aae commit 54ba3ac
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ find_package(FluxCore REQUIRED)
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
message(STATUS "flux core found and no specific prefix specified, using ${FLUX_CORE_PREFIX}")
set(CMAKE_INSTALL_PREFIX ${FLUX_CORE_PREFIX} CACHE PATH "..." FORCE)
message(STATUS "Using flux-core libdir of ${FLUX_CORE_LIBDIR}")
set(CMAKE_INSTALL_LIBDIR ${FLUX_CORE_LIBDIR} CACHE PATH "..." FORCE)
endif()
if(DEFINED ENV{PYTHON})
set(Python_EXECUTABLE $ENV{PYTHON} CACHE FILEPATH "")
Expand Down

0 comments on commit 54ba3ac

Please sign in to comment.