Skip to content

Commit 05538ec

Browse files
authored
Merge pull request #444 from GEOS-ESM/feature/v3-set-libdir
2 parents 9174b80 + 603d75b commit 05538ec

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1313

1414
### Added
1515

16+
- 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
17+
1618
### Changed
1719

1820
### Deprecated

esma.cmake

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@ esma_check_install_prefix()
66

77
### ecbuild Support ###
88

9+
# GEOS' scripting currently assumes `install/lib` is where
10+
# libraries will be installed. For good or ill, we need to
11+
# follow this convention. But ecbuild might, via GNUInstallDirs,
12+
# set it at lib64. This overrides that.
13+
#
14+
# NOTE: This must be called *before* including ecbuild (or
15+
# rather before GNUInstallDirs is included
16+
set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Libraries")
17+
918
# Bring in ecbuild
1019
if (IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/ecbuild")
1120
list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/ecbuild/cmake")

0 commit comments

Comments
 (0)