From a70771ae894c787337e6393ff016c8e93e4237a3 Mon Sep 17 00:00:00 2001 From: Alexander Kiselyov Date: Thu, 16 Jun 2022 00:34:14 +0300 Subject: [PATCH] Fixed cmake install path in case of empty architecture (#322) --- cmake/cxxopts.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/cxxopts.cmake b/cmake/cxxopts.cmake index 46e87ba..0ead543 100644 --- a/cmake/cxxopts.cmake +++ b/cmake/cxxopts.cmake @@ -87,7 +87,12 @@ endfunction() # Helper function to ecapsulate install logic function(cxxopts_install_logic) - string(REPLACE "/${CMAKE_LIBRARY_ARCHITECTURE}" "" CMAKE_INSTALL_LIBDIR_ARCHIND "${CMAKE_INSTALL_LIBDIR}") + if(CMAKE_LIBRARY_ARCHITECTURE) + string(REPLACE "/${CMAKE_LIBRARY_ARCHITECTURE}" "" CMAKE_INSTALL_LIBDIR_ARCHIND "${CMAKE_INSTALL_LIBDIR}") + else() + # On some systems (e.g. NixOS), `CMAKE_LIBRARY_ARCHITECTURE` can be empty + set(CMAKE_INSTALL_LIBDIR_ARCHIND "${CMAKE_INSTALL_LIBDIR}") + endif() set(CXXOPTS_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR_ARCHIND}/cmake/cxxopts" CACHE STRING "Installation directory for cmake files, relative to ${CMAKE_INSTALL_PREFIX}.") set(version_config "${PROJECT_BINARY_DIR}/cxxopts-config-version.cmake") set(project_config "${PROJECT_BINARY_DIR}/cxxopts-config.cmake") -- libgit2 0.21.4