From 6c14bc5721d44eb46b9b761b412be454316278d8 Mon Sep 17 00:00:00 2001 From: David Williams-Young Date: Wed, 18 Oct 2023 09:13:57 -0700 Subject: [PATCH 1/2] Move GNUInstallDirs before setting TILEDARRAY_INSTALL_XYZ --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 520898704d..97b3d736e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,6 +78,7 @@ enable_language(C) # C needed even for basic platform introspection # Set install paths ============================================================ +include(GNUInstallDirs) set(TILEDARRAY_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH "TiledArray binary install directory") set(TILEDARRAY_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}" @@ -96,7 +97,6 @@ set(TILEDARRAY_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/tiledarray" # Add module directory and modules ============================================= list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules/) include(CMakePushCheckState) -include(GNUInstallDirs) include(AppendFlags) include(RedefaultableOption) include(DetectMADNESSConfig) From 172a37a9e20fc8f9bad56b506eb703bbdb962f6a Mon Sep 17 00:00:00 2001 From: Eduard Valeyev Date: Wed, 18 Oct 2023 15:52:02 -0400 Subject: [PATCH 2/2] [skip ci] removed unused TILEDARRAY_INSTALL_{SHARE,DATA}DIR --- CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 97b3d736e9..17f2b480a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,10 +85,6 @@ set(TILEDARRAY_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH "TiledArray INCLUDE install directory") set(TILEDARRAY_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "TiledArray LIB install directory") -set(TILEDARRAY_INSTALL_SHAREDIR "${CMAKE_INSTALL_DATAROOTDIR}/tiledarray/${TILEDARRAY_EXT_VERSION}" - CACHE PATH "TiledArray DATA install directory") -set(TILEDARRAY_INSTALL_DATADIR "${TILEDARRAY_INSTALL_SHAREDIR}/data" - CACHE PATH "TiledArray DATA install directory") set(TILEDARRAY_INSTALL_DOCDIR "${TILEDARRAY_INSTALL_SHAREDIR}/doc" CACHE PATH "TiledArray DOC install directory") set(TILEDARRAY_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/tiledarray"