From 67d8fd921502c5b5533eff153d6cf002c972854a Mon Sep 17 00:00:00 2001 From: "M. Eric Irrgang" Date: Fri, 21 May 2021 10:02:15 -0500 Subject: [PATCH] Let installed library options default to BUILD_SHARED_LIBS. Fixes #4053 --- api/CMakeLists.txt | 4 ++-- docs/release-notes/2022/major/portability.rst | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/api/CMakeLists.txt b/api/CMakeLists.txt index 5773bbf265..fdf3a2a595 100644 --- a/api/CMakeLists.txt +++ b/api/CMakeLists.txt @@ -42,7 +42,7 @@ if(GMX_NATIVE_WINDOWS) # GMXAPI requires position-independent code set(_GMXAPI_DEFAULT OFF) else() - set(_GMXAPI_DEFAULT ON) + set(_GMXAPI_DEFAULT ${BUILD_SHARED_LIBS}) endif() option(GMXAPI "Install GROMACS API." ${_GMXAPI_DEFAULT}) if (GMXAPI) @@ -55,7 +55,7 @@ if(GMX_NATIVE_WINDOWS OR NOT BUILD_SHARED_LIBS) # NBLIB requires position-independent code set(_NBLIB_DEFAULT OFF) else() - set(_NBLIB_DEFAULT ON) + set(_NBLIB_DEFAULT ${BUILD_SHARED_LIBS}) endif() option(GMX_INSTALL_NBLIB_API "Install nblib headers" ${_NBLIB_DEFAULT}) if (GMX_INSTALL_NBLIB_API) diff --git a/docs/release-notes/2022/major/portability.rst b/docs/release-notes/2022/major/portability.rst index 75c4b4865e..c0f4265751 100644 --- a/docs/release-notes/2022/major/portability.rst +++ b/docs/release-notes/2022/major/portability.rst @@ -8,3 +8,14 @@ We now support the Intel clang-based compiler from oneAPI (icx/icpx) instead. Please use it, or gcc. :issue:`3893` + +Provisional: Initialize GMX_INSTALL_NBLIB_API and GMXAPI build options from BUILD_SHARED_LIBS +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" + +CMake options ``GMXAPI`` and ``GMX_INSTALL_NBLIB_API`` produce shared object libraries, +so their default values are now initialized from ``BUILD_SHARED_LIBS``. +Pending movement on :issue:`3605` and related issues, the coupling between these +options is subject to change, but users generally should not need to manually set +``GMXAPI`` and ``GMX_INSTALL_NBLIB_API``. + +:issue:`4053` -- 2.22.0