diff --git a/recipe/bld.bat b/recipe/bld.bat index 732ba10..b6326fc 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -10,11 +10,13 @@ set HDF5_EXT_ZLIB=zlib.lib set "CXXFLAGS=%CXXFLAGS% -LTCG" if "%mpi%"=="impi" ( - set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_C_ADDITIONAL_INCLUDE_DIRS=%LIBRARY_PREFIX%\include" - set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_CXX_ADDITIONAL_INCLUDE_DIRS=%LIBRARY_PREFIX%\include" + :: cmake generates syntax errors if there are backslashes in paths + set _LIBRARY=%LIBRARY_PREFIX:\=/% + set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_C_ADDITIONAL_INCLUDE_DIRS:PATH=!_LIBRARY!/include" + set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_CXX_ADDITIONAL_INCLUDE_DIRS:PATH=!_LIBRARY!/include" set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_C_LIB_NAMES=IMPI" set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_CXX_LIB_NAMES=IMPI" - set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_IMPI_LIBRARY=impi.lib" + set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_IMPI_LIBRARY:PATH=!_LIBRARY!/lib/impi.lib" set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_ASSUME_NO_BUILTIN_MPI=ON" set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_SKIP_COMPILER_WRAPPER=ON" set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_SKIP_GUESSING=ON" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 578b4ac..09a8bfc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set version = "1.14.3" %} {% set maj_min_ver = ".".join(version.split(".")[:2]) %} -{% set build = 3 %} +{% set build = 4 %} # recipe-lint fails if mpi is undefined {% set mpi = mpi or 'nompi' %}