diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /devel/umpire/files/patch-src_tpl_CMakeLists.txt | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'devel/umpire/files/patch-src_tpl_CMakeLists.txt')
| -rw-r--r-- | devel/umpire/files/patch-src_tpl_CMakeLists.txt | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/devel/umpire/files/patch-src_tpl_CMakeLists.txt b/devel/umpire/files/patch-src_tpl_CMakeLists.txt new file mode 100644 index 000000000000..7e195b9c1e78 --- /dev/null +++ b/devel/umpire/files/patch-src_tpl_CMakeLists.txt @@ -0,0 +1,36 @@ +--- src/tpl/CMakeLists.txt.orig 2025-09-09 19:07:47 UTC ++++ src/tpl/CMakeLists.txt +@@ -106,6 +106,8 @@ add_subdirectory(umpire/judy) + + add_subdirectory(umpire/judy) + ++find_package(camp REQUIRED) ++ + if (NOT TARGET camp) + if (DEFINED camp_DIR) + find_package(camp REQUIRED +@@ -136,6 +138,8 @@ endif () + endif() + endif () + ++find_package(fmt REQUIRED) ++ + if (NOT TARGET ${UMPIRE_FMT_TARGET}) + if (DEFINED fmt_DIR) + find_package(fmt REQUIRED +@@ -144,8 +148,7 @@ if (NOT TARGET ${UMPIRE_FMT_TARGET}) + ${fmt_DIR} + ${fmt_DIR}/lib64/cmake/fmt) + +- set_target_properties(${UMPIRE_FMT_TARGET} PROPERTIES IMPORTED_GLOBAL TRUE) +- blt_convert_to_system_includes(TARGET ${UMPIRE_FMT_TARGET}) ++ #blt_convert_to_system_includes(TARGET ${UMPIRE_FMT_TARGET}) + set(UMPIRE_CONFIG_fmt_DIR ${fmt_DIR} CACHE PATH "") + else () + if (NOT EXISTS ${PROJECT_SOURCE_DIR}/src/tpl/umpire/fmt/CMakeLists.txt) +@@ -161,4 +164,4 @@ set(UMPIRE_ENABLE_TESTS ${OLD_ENABLE_TESTS}) + endif () + + set(UMPIRE_ENABLE_TESTS ${OLD_ENABLE_TESTS}) +-set(UMPIRE_ENABLE_FORTRAN ${OLD_ENABLE_FORTRAN}) ++#set(UMPIRE_ENABLE_FORTRAN FALSE) |