Renamed COPY and RESOLVE h5gt deps

tierra-colada · Jun 17, 2022 · cc11a0b · cc11a0b
1 parent b5c5f70
commit cc11a0b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ matrix:
         - HDF5_PREFER_PARALLEL=True
         - H5GT_BUILD_h5gtpy=True
         - HDF5_RUNTIME_DIRS=""
-        - COPY_H5GTPY_RUNTIME_DEPS=True
+        - H5GTPY_COPY_RUNTIME_DEPS=True
         - HDF5_USE_STATIC_LIBRARIES=False
         - CMAKE_GENERATOR="Ninja"
         - TESTS_TARGET="test"
@@ -41,7 +41,7 @@ matrix:
         - HDF5_PREFER_PARALLEL=True
         - H5GT_BUILD_h5gtpy=True
         - HDF5_RUNTIME_DIRS=""
-        - COPY_H5GTPY_RUNTIME_DEPS=True
+        - H5GTPY_COPY_RUNTIME_DEPS=True
         - HDF5_USE_STATIC_LIBRARIES=False
         - CMAKE_GENERATOR="Ninja"
         - TESTS_TARGET="test"
@@ -65,7 +65,7 @@ matrix:
         - HDF5_PREFER_PARALLEL=True
         - H5GT_BUILD_h5gtpy=True
         - HDF5_RUNTIME_DIRS=""
-        - COPY_H5GTPY_RUNTIME_DEPS=False
+        - H5GTPY_COPY_RUNTIME_DEPS=False
         - HDF5_USE_STATIC_LIBRARIES=False
         - CMAKE_GENERATOR="Ninja"
         - TESTS_TARGET="test"
@@ -86,7 +86,7 @@ matrix:
         - HDF5_PREFER_PARALLEL=False
         - H5GT_BUILD_h5gtpy=True
         - HDF5_RUNTIME_DIRS="C:/Tools/miniconda3/Library/bin"
-        - COPY_H5GTPY_RUNTIME_DEPS=True
+        - H5GTPY_COPY_RUNTIME_DEPS=True
         - HDF5_USE_STATIC_LIBRARIES=False
         - CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
         - TESTS_TARGET="RUN_TESTS"
@@ -102,7 +102,7 @@ matrix:
         - HDF5_PREFER_PARALLEL=False
         - H5GT_BUILD_h5gtpy=True
         - HDF5_RUNTIME_DIRS="C:/Tools/miniconda3/Library/bin"
-        - COPY_H5GTPY_RUNTIME_DEPS=False
+        - H5GTPY_COPY_RUNTIME_DEPS=False
         - HDF5_USE_STATIC_LIBRARIES=False
         - CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
         - TESTS_TARGET="RUN_TESTS"
@@ -120,7 +120,7 @@ matrix:
         - HDF5_PREFER_PARALLEL=False
         - H5GT_BUILD_h5gtpy=True
         - HDF5_RUNTIME_DIRS="/Users/travis/miniconda/bin"
-        - COPY_H5GTPY_RUNTIME_DEPS=False
+        - H5GTPY_COPY_RUNTIME_DEPS=False
         - HDF5_USE_STATIC_LIBRARIES=False
         - CMAKE_GENERATOR="Ninja"
         - TESTS_TARGET="test"
@@ -182,7 +182,7 @@ script:
     -DHDF5_PREFER_PARALLEL:BOOL=${HDF5_PREFER_PARALLEL}
     -DH5GT_BUILD_h5gtpy=${H5GT_BUILD_h5gtpy}
     -DHDF5_RUNTIME_DIRS=${HDF5_RUNTIME_DIRS}
-    -DCOPY_H5GTPY_RUNTIME_DEPS=${COPY_H5GTPY_RUNTIME_DEPS}
+    -DH5GTPY_COPY_RUNTIME_DEPS=${H5GTPY_COPY_RUNTIME_DEPS}
     -DHDF5_USE_STATIC_LIBRARIES=${HDF5_USE_STATIC_LIBRARIES}  
     -G "${CMAKE_GENERATOR}" ../
   - cmake --build . --config Release -j

diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ cmake ..
   -DEigen3_ROOT=/path/to/eigen3 
   -DHDF5_DIR=/path/to/hdf5-config.cmake 
   -DHDF5_RUNTIME_DIRS=/path/to/hdf5-runtime   
-  -DZLIB_RUNTIME_DIRS=/path/to/zlib-runtime   -DCOPY_H5GTPY_RUNTIME_DEPS=ON
+  -DZLIB_RUNTIME_DIRS=/path/to/zlib-runtime   -DH5GTPY_COPY_RUNTIME_DEPS=ON
 cmake --build . 
 ```
 If your HDF5 depends on ZLIB or MPI you may also need to add it.

diff --git a/cmake/h5gtpy-install.cmake.in b/cmake/h5gtpy-install.cmake.in
@@ -12,7 +12,7 @@ set(COMMON_PROJECT_VERSION @COMMON_PROJECT_VERSION@)
 #-----------------------------------------------------------------------------
 # Finding RUNTIME DEPS (i.e. hdf5.dll)
 #-----------------------------------------------------------------------------
-if(@RESOLVE_H5GTPY_RUNTIME_DEPS@)
+if(@H5GTPY_RESOLVE_RUNTIME_DEPS@)
 
   message(STATUS "Resolving h5gtpy RUNTIME dependencies...")
 
@@ -74,7 +74,7 @@ if(@RESOLVE_H5GTPY_RUNTIME_DEPS@)
     (you don't have to rebuild the project)")
   endif()
 
-endif(@RESOLVE_H5GTPY_RUNTIME_DEPS@)
+endif(@H5GTPY_RESOLVE_RUNTIME_DEPS@)
 
 #-----------------------------------------------------------------------------
 # Setting variables needed to configure in-files
@@ -107,10 +107,10 @@ set(TEST_PY_OUT_DIR "${H5GTPY_DIR}/tests")
 # Configuring in-files
 #-----------------------------------------------------------------------------
 
-if(@RESOLVE_H5GTPY_RUNTIME_DEPS@)
+if(@H5GTPY_RESOLVE_RUNTIME_DEPS@)
 
   # copy runtime deps or change __init__.py file to modify ENV PATH
-  if(@COPY_H5GTPY_RUNTIME_DEPS@)
+  if(@H5GTPY_COPY_RUNTIME_DEPS@)
     foreach(_file ${res_deps})
       message("Copying runtime dependency:\t${_file} \nto:\t${H5GTPY_DIR}")
       configure_file("${_file}" "${H5GTPY_DIR}" COPYONLY)
@@ -138,7 +138,7 @@ if not os.environ['PATH'].__contains__('${_dir}'):
     endif()
   endif()
 
-endif(@RESOLVE_H5GTPY_RUNTIME_DEPS@)
+endif(@H5GTPY_RESOLVE_RUNTIME_DEPS@)
 
 configure_file("${SETUP_PY_IN}" "${SETUP_PY_OUT}")
 configure_file("${MANIFEST_IN}" "${MANIFEST_OUT}")

diff --git a/src/h5gtpy/CMakeLists.txt b/src/h5gtpy/CMakeLists.txt
@@ -4,9 +4,9 @@ message("project: ${PROJECT_NAME} ${COMMON_PROJECT_VERSION}")
 
 set(HDF5_RUNTIME_DIRS "" CACHE PATH "hdf5 runtime is a dependency of h5gtpy")
 set(ZLIB_RUNTIME_DIRS "" CACHE PATH "zlib runtime is an optional dependency of hdf5")
-option(COPY_H5GTPY_RUNTIME_DEPS "Copy hdf5 (and maybe zlib) runtime to python site-packages
+option(H5GTPY_COPY_RUNTIME_DEPS "Copy hdf5 (and maybe zlib) runtime to python site-packages
   (otherwise it will simply add to ENV PATH to hdf5 runtime dir in `__init__.py`)" OFF)
-option(RESOLVE_H5GTPY_RUNTIME_DEPS "If OFF then nothing will be done to resolve deps" ON)
+option(H5GTPY_RESOLVE_RUNTIME_DEPS "If OFF then nothing will be done to resolve deps" ON)
 
 include(FetchContent)
 FetchContent_Declare(