From 0503037690447840953f13442309a100fad62bd8 Mon Sep 17 00:00:00 2001 From: Nils Schild Date: Mon, 12 Sep 2022 15:38:13 +0200 Subject: [PATCH 1/5] Remove Caching of global CMake variables. --- CMakeLists.txt | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 699b4b9f06..8a0d5ad7a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,26 +44,21 @@ endif() # # temporary build directories if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY) - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" - CACHE PATH "Build directory for archives") + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") endif() if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" - CACHE PATH "Build directory for libraries") + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") endif() if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - CACHE PATH "Build directory for binaries") + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") endif() # install directories if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) include(GNUInstallDirs) - set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/openPMD" - CACHE PATH "CMake config package location for installed targets") + set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/openPMD") if(WIN32) - set(CMAKE_INSTALL_LIBDIR Lib - CACHE PATH "Object code libraries") - set_property(CACHE CMAKE_INSTALL_CMAKEDIR PROPERTY VALUE "cmake") + set(CMAKE_INSTALL_LIBDIR Lib) + set_property(CMAKE_INSTALL_CMAKEDIR PROPERTY VALUE "cmake") endif() endif() @@ -98,8 +93,7 @@ option(openPMD_USE_VERIFY "Enable internal VERIFY (assert) macro independent of set(CMAKE_CONFIGURATION_TYPES "Release;Debug;MinSizeRel;RelWithDebInfo") if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Release" CACHE STRING - "Choose the build type, e.g. Release or Debug." FORCE) + set(CMAKE_BUILD_TYPE "Release") endif() include(CMakeDependentOption) @@ -753,13 +747,9 @@ if(openPMD_HAVE_PYTHON) "${CMAKE_INSTALL_LIBDIR}/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages" ) endif() - set(CMAKE_INSTALL_PYTHONDIR "${CMAKE_INSTALL_PYTHONDIR_DEFAULT}" - CACHE STRING "Location for installed python package" - ) + set(CMAKE_INSTALL_PYTHONDIR "${CMAKE_INSTALL_PYTHONDIR_DEFAULT}") set(CMAKE_PYTHON_OUTPUT_DIRECTORY - "${openPMD_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}" - CACHE PATH "Build directory for python modules" - ) + "${openPMD_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}") set_target_properties(openPMD.py PROPERTIES ARCHIVE_OUTPUT_NAME openpmd_api_cxx LIBRARY_OUTPUT_NAME openpmd_api_cxx From 93bf907275bce37e469944ba8c0c7730ad53be18 Mon Sep 17 00:00:00 2001 From: Nils Schild Date: Thu, 15 Sep 2022 10:40:16 +0200 Subject: [PATCH 2/5] Add comment to non standard cmake variables which previously given in CACHE string. --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a0d5ad7a4..378b3f612c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -740,16 +740,16 @@ if(openPMD_HAVE_PYTHON) if(WIN32) set(CMAKE_INSTALL_PYTHONDIR_DEFAULT - "${CMAKE_INSTALL_LIBDIR}/site-packages" - ) + "${CMAKE_INSTALL_LIBDIR}/site-packages") else() set(CMAKE_INSTALL_PYTHONDIR_DEFAULT "${CMAKE_INSTALL_LIBDIR}/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages" ) endif() + # Location for installed python package set(CMAKE_INSTALL_PYTHONDIR "${CMAKE_INSTALL_PYTHONDIR_DEFAULT}") - set(CMAKE_PYTHON_OUTPUT_DIRECTORY - "${openPMD_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}") + # Build directory for python modules + set(CMAKE_PYTHON_OUTPUT_DIRECTORY "${openPMD_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}") set_target_properties(openPMD.py PROPERTIES ARCHIVE_OUTPUT_NAME openpmd_api_cxx LIBRARY_OUTPUT_NAME openpmd_api_cxx From 9901447bbab147bb5106dca813b60f69dfffb249 Mon Sep 17 00:00:00 2001 From: Nils Schild Date: Thu, 15 Sep 2022 11:24:03 +0200 Subject: [PATCH 3/5] Need a commit to trigger workflows. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 378b3f612c..4c16c851cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1166,7 +1166,7 @@ if(openPMD_BUILD_TESTING) if(${testname} MATCHES "^Parallel.*$") if(openPMD_HAVE_MPI) add_test(NAME MPI.${testname} - COMMAND ${MPI_TEST_EXE} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${testname}Tests + COMMAND ${MPI_TEST_EXE} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${testname}Tests WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ) endif() From b409a33ccfa1dec7efb79ad3da817668c2c9deef Mon Sep 17 00:00:00 2001 From: Nils Schild Date: Thu, 15 Sep 2022 11:24:16 +0200 Subject: [PATCH 4/5] Need a commit to trigger workflows. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c16c851cc..378b3f612c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1166,7 +1166,7 @@ if(openPMD_BUILD_TESTING) if(${testname} MATCHES "^Parallel.*$") if(openPMD_HAVE_MPI) add_test(NAME MPI.${testname} - COMMAND ${MPI_TEST_EXE} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${testname}Tests + COMMAND ${MPI_TEST_EXE} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${testname}Tests WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ) endif() From 796045346a822285b2b0270ca66fa4bcf6d37687 Mon Sep 17 00:00:00 2001 From: Nils Schild Date: Thu, 15 Sep 2022 14:01:16 +0200 Subject: [PATCH 5/5] Replace set_property by set since no Cache value has to be changed. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 378b3f612c..55f73954e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/openPMD") if(WIN32) set(CMAKE_INSTALL_LIBDIR Lib) - set_property(CMAKE_INSTALL_CMAKEDIR PROPERTY VALUE "cmake") + set(CMAKE_INSTALL_CMAKEDIR "cmake") endif() endif()