diff options
Diffstat (limited to 'math/moab/files')
| -rw-r--r-- | math/moab/files/patch-CMakeLists.txt | 43 | ||||
| -rw-r--r-- | math/moab/files/patch-src_io_WriteNCDF.cpp | 20 |
2 files changed, 54 insertions, 9 deletions
diff --git a/math/moab/files/patch-CMakeLists.txt b/math/moab/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..32dc03a0a7bc --- /dev/null +++ b/math/moab/files/patch-CMakeLists.txt @@ -0,0 +1,43 @@ +- workaround for https://bitbucket.org/fathomteam/moab/issues/148/530-cmake-error-at-cmake_installcmake-68 + +--- CMakeLists.txt.orig 2021-11-12 00:54:52 UTC ++++ CMakeLists.txt +@@ -618,7 +618,7 @@ endif(CLANG_TIDY_EXE) + CONFIGURE_FILE(config/MOABConfig.cmake.h.in "${PROJECT_BINARY_DIR}/src/moab/MOABConfig.h" @ONLY) + + CONFIGURE_FILE(config/MOABConfig.cmake.cmake "${PROJECT_BINARY_DIR}/MOABConfig.cmake" @ONLY) +-CONFIGURE_FILE(moab.make.cmake "${PROJECT_BINARY_DIR}/lib/moab.make" @ONLY) ++CONFIGURE_FILE(moab.make.cmake "lib/moab.make" @ONLY) + if ( MOAB_HAVE_FBIGEOM ) + CONFIGURE_FILE(itaps/fbigeom/FBiGeom-Defs.inc.in "${PROJECT_BINARY_DIR}/lib/FBiGeom-Defs.inc" @ONLY) + install( +@@ -636,23 +636,24 @@ if ( MOAB_HAVE_IMESH ) + endif ( MOAB_HAVE_IMESH ) + INSTALL( + FILES "${PROJECT_BINARY_DIR}/lib/moab.make" +- DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ DESTINATION lib + ) ++message(STATUS "YURI DESTDIR=${FREEBSD_STAGEDIR}") + INSTALL( + CODE +- "file(APPEND ${CMAKE_INSTALL_FULL_LIBDIR}/moab.make MOAB_LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}\\n )" ++ "file(APPEND ${FREEBSD_STAGEDIR}${CMAKE_INSTALL_FULL_LIBDIR}/moab.make MOAB_LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}\\n )" + ) + INSTALL( + CODE +- "file(APPEND ${CMAKE_INSTALL_FULL_LIBDIR}/moab.make MOAB_INCLUDES=-I${CMAKE_INSTALL_FULL_INCLUDEDIR}\\n )" ++ "file(APPEND ${FREEBSD_STAGEDIR}${CMAKE_INSTALL_FULL_LIBDIR}/moab.make MOAB_INCLUDES=-I${CMAKE_INSTALL_FULL_INCLUDEDIR}\\n )" + ) + INSTALL( + FILES "${PROJECT_BINARY_DIR}/MOABConfig.cmake" +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MOAB/ ++ DESTINATION lib/cmake/MOAB/ + ) + INSTALL( + FILES "${PROJECT_SOURCE_DIR}/config/ResolveCompilerPaths.cmake" +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MOAB ++ DESTINATION lib/cmake/MOAB + ) + + ADD_CUSTOM_TARGET( diff --git a/math/moab/files/patch-src_io_WriteNCDF.cpp b/math/moab/files/patch-src_io_WriteNCDF.cpp index 8c91cad073bb..bba6c59dcfd1 100644 --- a/math/moab/files/patch-src_io_WriteNCDF.cpp +++ b/math/moab/files/patch-src_io_WriteNCDF.cpp @@ -1,13 +1,15 @@ ---- src/io/WriteNCDF.cpp.orig 2018-11-23 06:26:09 UTC +- workaround for https://bitbucket.org/fathomteam/moab/issues/157/please-do-not-convert-null-to-char-this + +--- src/io/WriteNCDF.cpp.orig 2021-11-12 00:54:52 UTC +++ src/io/WriteNCDF.cpp -@@ -161,8 +161,8 @@ void WriteNCDF::time_and_date(char* time - strftime(date_string, TIME_STR_LEN, "%m/%d/%Y", local_time); +@@ -160,8 +160,8 @@ void WriteNCDF::time_and_date( char* time_string, char + strftime( date_string, TIME_STR_LEN, "%m/%d/%Y", local_time ); - // Terminate with NULL character -- time_string[10] = (char)NULL; -- date_string[10] = (char)NULL; -+ time_string[10] = (char)0; -+ date_string[10] = (char)0; + // Terminate with NULL character +- time_string[10] = (char)NULL; +- date_string[10] = (char)NULL; ++ time_string[10] = (char)0; ++ date_string[10] = (char)0; } - ErrorCode WriteNCDF::write_file(const char *exodus_file_name, + ErrorCode WriteNCDF::write_file( const char* exodus_file_name, const bool overwrite, const FileOptions& opts, |