From 1ac5c875e40efe5e6028c210a01e039734073e67 Mon Sep 17 00:00:00 2001 From: Thomas Hahn Date: Wed, 28 Feb 2024 16:10:12 -0500 Subject: [PATCH 1/2] [cmake] Use unstable branch of cpp2py --- deps/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index f6a3b89..e26dfba 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -52,7 +52,7 @@ if(PythonSupport OR (NOT IS_SUBPROJECT AND Build_Documentation)) external_dependency(Cpp2Py GIT_REPO https://github.com/TRIQS/cpp2py VERSION 2.0 - GIT_TAG master + GIT_TAG unstable BUILD_ALWAYS EXCLUDE_FROM_ALL ) From e92057573d5c3db9dc1fce6f386e2ae57f4b124d Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Fri, 1 Mar 2024 10:37:51 -0500 Subject: [PATCH 2/2] [cmake] Fix target inclusion directory to use GNUInstallDirs --- share/cmake/app4triqs-config.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/cmake/app4triqs-config.cmake.in b/share/cmake/app4triqs-config.cmake.in index f5a8427..b349060 100644 --- a/share/cmake/app4triqs-config.cmake.in +++ b/share/cmake/app4triqs-config.cmake.in @@ -24,7 +24,7 @@ set(@PROJECT_NAME@_ROOT @CMAKE_INSTALL_PREFIX@ CACHE STRING "@PROJECT_NAME@ root #find_dep(depname 1.0) # Include the exported targets of this project -include(@CMAKE_INSTALL_PREFIX@/lib/cmake/@PROJECT_NAME@/@PROJECT_NAME@-targets.cmake) +include(@CMAKE_INSTALL_LIBDIR@/cmake/@PROJECT_NAME@/@PROJECT_NAME@-targets.cmake) message(STATUS "Found @PROJECT_NAME@-config.cmake with version @PROJECT_VERSION@, hash = @PROJECT_GIT_HASH@, root = @CMAKE_INSTALL_PREFIX@")