From 08190bce2133185092848d4f4bdebb868f74841c Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 12 Jan 2021 14:24:57 -0800 Subject: [PATCH 1/3] openPMD-api: new CMake Control (tests) Use the latest commit in openPMD-api (dev branch post 0.13.1) that adds control for per-project build options for tests. This saves us from building and running openPMD-api tests in the HiPACE superbuild. --- cmake/dependencies/openPMD.cmake | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/dependencies/openPMD.cmake b/cmake/dependencies/openPMD.cmake index c62c747255..859f12ae76 100644 --- a/cmake/dependencies/openPMD.cmake +++ b/cmake/dependencies/openPMD.cmake @@ -4,13 +4,13 @@ function(find_openpmd) include(FetchContent) set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) - # see https://openpmd-api.readthedocs.io/en/0.12.0-alpha/dev/buildoptions.html - set(openPMD_USE_MPI ${HiPACE_MPI} CACHE INTERNAL "") - set(openPMD_USE_PYTHON OFF CACHE INTERNAL "") - set(BUILD_CLI_TOOLS OFF CACHE INTERNAL "") # FIXME - set(BUILD_EXAMPLES OFF CACHE INTERNAL "") # FIXME - set(BUILD_TESTING ${BUILD_TESTING} CACHE INTERNAL "") # FIXME - set(openPMD_INSTALL ${BUILD_SHARED_LIBS} CACHE INTERNAL "") + # see https://openpmd-api.readthedocs.io/en/0.13.1-alpha/dev/buildoptions.html + set(openPMD_USE_MPI ${HiPACE_MPI} CACHE INTERNAL "") + set(openPMD_USE_PYTHON OFF CACHE INTERNAL "") + set(openPMD_BUILD_CLI_TOOLS OFF CACHE INTERNAL "") + set(openPMD_BUILD_EXAMPLES OFF CACHE INTERNAL "") + set(openPMD_BUILD_TESTING OFF CACHE INTERNAL "") + set(openPMD_INSTALL ${BUILD_SHARED_LIBS} CACHE INTERNAL "") FetchContent_Declare(fetchedopenpmd GIT_REPOSITORY ${HiPACE_openpmd_repo} @@ -62,7 +62,7 @@ if(HiPACE_OPENPMD) set(HiPACE_openpmd_repo "https://github.com/openPMD/openPMD-api.git" CACHE STRING "Repository URI to pull and build openPMD-api from if(HiPACE_openpmd_internal)") - set(HiPACE_openpmd_branch "0.13.1" + set(HiPACE_openpmd_branch "a9022ee30fe640a5ca1d92c30d0658cf2bfebec6" CACHE STRING "Repository branch for HiPACE_openpmd_repo if(HiPACE_openpmd_internal)") From 0089f6539bd3f2002bb4b6eb5137de43ea54fd96 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 14 Jan 2021 14:27:40 -0800 Subject: [PATCH 2/3] New commit Includes follow-up PR 900 for the new controls --- cmake/dependencies/openPMD.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/dependencies/openPMD.cmake b/cmake/dependencies/openPMD.cmake index 859f12ae76..764c4f413a 100644 --- a/cmake/dependencies/openPMD.cmake +++ b/cmake/dependencies/openPMD.cmake @@ -62,7 +62,7 @@ if(HiPACE_OPENPMD) set(HiPACE_openpmd_repo "https://github.com/openPMD/openPMD-api.git" CACHE STRING "Repository URI to pull and build openPMD-api from if(HiPACE_openpmd_internal)") - set(HiPACE_openpmd_branch "a9022ee30fe640a5ca1d92c30d0658cf2bfebec6" + set(HiPACE_openpmd_branch "ac083025ee662469b8cad1adf93eef48cde35f58" CACHE STRING "Repository branch for HiPACE_openpmd_repo if(HiPACE_openpmd_internal)") From cc4c4ca85d39cf73053388197321b1478c731a00 Mon Sep 17 00:00:00 2001 From: MaxThevenet Date: Fri, 15 Jan 2021 11:54:33 +0100 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Axel Huebl --- cmake/dependencies/openPMD.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/dependencies/openPMD.cmake b/cmake/dependencies/openPMD.cmake index 764c4f413a..1eb2065439 100644 --- a/cmake/dependencies/openPMD.cmake +++ b/cmake/dependencies/openPMD.cmake @@ -10,7 +10,7 @@ function(find_openpmd) set(openPMD_BUILD_CLI_TOOLS OFF CACHE INTERNAL "") set(openPMD_BUILD_EXAMPLES OFF CACHE INTERNAL "") set(openPMD_BUILD_TESTING OFF CACHE INTERNAL "") - set(openPMD_INSTALL ${BUILD_SHARED_LIBS} CACHE INTERNAL "") + set(openPMD_BUILD_SHARED_LIBS OFF CACHE INTERNAL "") FetchContent_Declare(fetchedopenpmd GIT_REPOSITORY ${HiPACE_openpmd_repo}