From 53d62a629eb1ae31e4fc227591ddc61b2ee2a0d1 Mon Sep 17 00:00:00 2001 From: David McKenna Date: Sat, 12 Oct 2024 20:12:03 +0800 Subject: [PATCH] Attempt to fix `ninja` builds; it's unclear as to where the root dir for BUILD_BYPRODUCTS is --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c947f4f1..8b529d5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -139,6 +139,7 @@ ExternalProject_Add(internal_zlib BUILD_IN_SOURCE TRUE # Keep source beside install prefix INSTALL_COMMAND cmake -E echo "Skipping zlib install step" UPDATE_COMMAND "" + BUILD_BYPRODUCTS src/internal_zlib/libz.a ) ExternalProject_Get_Property(internal_zlib INSTALL_DIR) set(zlib_INSTALL_DIR ${INSTALL_DIR}) @@ -154,6 +155,7 @@ ExternalProject_Add(internal_hdf5 INSTALL_COMMAND cmake -E echo "Skipping hdf5 install step" UPDATE_COMMAND "" DEPENDS internal_zlib + BUILD_BYPRODUCTS src/internal_hdf5/src/.libs/libhdf5.a ) ExternalProject_Get_Property(internal_hdf5 INSTALL_DIR) set(hdf5_INSTALL_DIR ${INSTALL_DIR}) @@ -172,6 +174,7 @@ ExternalProject_Add(internal_bitshuffle INSTALL_COMMAND cmake -E echo "Skipping bitshuffle install step" UPDATE_COMMAND "" DEPENDS internal_hdf5 zstd internal_zlib + BUILD_BYPRODUCTS src/internal_bitshuffle/libh5bshuf.a ) ExternalProject_Get_Property(internal_bitshuffle INSTALL_DIR) set(bitshuffle_INSTALL_DIR ${INSTALL_DIR}) @@ -204,6 +207,7 @@ ExternalProject_ADD(internal_FFTW3F BUILD_IN_SOURCE TRUE INSTALL_COMMAND cmake -E echo "Skipping FFTW3 install step" UPDATE_COMMAND "" + BUILD_BYPRODUCTS src/internal_FFTW3F/threads/.libs/libfftw3f_omp.a src/internal_FFTW3F/.libs/libfftw3f.a ) ExternalProject_Get_Property(internal_FFTW3F install_dir) set(fftw3f_INSTALL_DIR ${install_dir})