Skip to content

v4: Set CMAKE_INSTALL_LIBDIR to lib #445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mathomp4 merged 2 commits into from
May 2, 2025
Merged

v4: Set CMAKE_INSTALL_LIBDIR to lib #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85b158b
v4: Set CMAKE_INSTALL_LIBDIR to lib
mathomp4 May 2, 2025
0f4c182
Merge branch 'develop' into feature/v4-set-libdir
mathomp4 May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- Explicitly set `CMAKE_INSTALL_LIBDIR` to `lib` to override `GNUInstallDirs` from setting it to `lib64`. This is mainly needed due to assumptions in GEOS scripting

### Changed

- Added support for Emerald Rapids
Expand Down
9 changes: 9 additions & 0 deletions esma.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ esma_check_install_prefix()

### ecbuild Support ###

# GEOS' scripting currently assumes `install/lib` is where
# libraries will be installed. For good or ill, we need to
# follow this convention. But ecbuild might, via GNUInstallDirs,
# set it at lib64. This overrides that.
#
# NOTE: This must be called *before* including ecbuild (or
# rather before GNUInstallDirs is included
set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Libraries")

# Bring in ecbuild
if (IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/ecbuild")
list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/ecbuild/cmake")
Expand Down