646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
30 lines
941 B
Diff
30 lines
941 B
Diff
diff --git a/config/template.cmake b/config/template.cmake
|
|
index 2b3abcbb..59fcd728 100644
|
|
--- a/config/template.cmake
|
|
+++ b/config/template.cmake
|
|
@@ -8,9 +8,7 @@ if(NOT TARGET "@PROJECT_NAME@::@PROJECT_NAME@")
|
|
|
|
include(CMakeFindDependencyMacro)
|
|
|
|
- if(NOT TARGET "OpenMP::OpenMP_Fortran" AND "@PROJECT_NAME@_WITH_OpenMP")
|
|
- find_dependency("OpenMP")
|
|
- endif()
|
|
+ find_dependency("OpenMP")
|
|
|
|
if(NOT TARGET "toml-f::toml-f" AND "@PROJECT_NAME@_WITH_JSON")
|
|
find_dependency("toml-f")
|
|
diff --git a/config/template.pc b/config/template.pc
|
|
index 84c3498c..2da50191 100644
|
|
--- a/config/template.pc
|
|
+++ b/config/template.pc
|
|
@@ -1,6 +1,6 @@
|
|
-prefix=@CMAKE_INSTALL_PREFIX@
|
|
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
|
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
|
|
+prefix=@CMAKE_INSTALL_PREFIX@
|
|
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
|
|
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
|
|
|
|
Name: @PROJECT_NAME@
|
|
Description: @PROJECT_DESCRIPTION@
|