Commit bcd99950 authored by T.J. Corona's avatar T.J. Corona

Update moab and add eigen as a dependency.

parent 260d3149
Pipeline #95863 passed with stage
......@@ -42,6 +42,7 @@ function (superbuild_find_projects var)
cmbworkflows
cumulus
cxx11
eigen
fortran
freetype
ftgl
......
superbuild_add_project(eigen
DEPENDS cxx11)
superbuild_add_project(moab
DEPENDS hdf5 netcdf
DEPENDS eigen hdf5 netcdf
DEPENDS_OPTIONAL cxx11
#cgm
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=OFF
-DENABLE_BLASLAPACK:BOOL=OFF
-DMOAB_HAVE_EIGEN:BOOL=ON
-DMOAB_USE_SZIP:BOOL=ON
-DMOAB_USE_CGM:BOOL=OFF
-DMOAB_USE_CGNS:BOOL=OFF
......@@ -14,3 +16,6 @@ superbuild_add_project(moab
-DENABLE_NETCDF:BOOL=ON # also required to get ncdf/exodus enabled
-DNETCDF_ROOT:PATH=<INSTALL_DIR>
-DMOAB_ENABLE_TESTING:BOOL=ON) # build can't handle this being disabled
superbuild_apply_patch(moab disable-fortran
"Disable use of fortran")
Binary files moab_ft/.git/index and moab_ft_patched/.git/index differ
diff -Nr -U5 moab_ft/CMakeLists.txt moab_ft_patched/CMakeLists.txt
--- moab_ft/CMakeLists.txt 2018-01-04 13:55:02.000000000 -0500
+++ moab_ft_patched/CMakeLists.txt 2018-01-04 14:13:59.000000000 -0500
@@ -1,27 +1,27 @@
cmake_minimum_required( VERSION 2.8.12 )
SET(PACKAGE_NAME "MOAB")
SET(PACKAGE_VERSION "5.0.1")
-if (NOT WIN32)
- #This all breaks on windows.
- SET(CMAKE_Fortran_COMPILER_INIT ${CMAKE_GENERATOR_FC})
- SET(CMAKE_CXX_FLAGS_INIT "-fPIC -DPIC")
- SET(CMAKE_CXX_FLAGS_DEBUG_INIT "-O0 -g")
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
- SET(CMAKE_CXX_FLAGS_RELEASE_INIT "-O2 -DNDEBUG")
- SET(CMAKE_C_FLAGS_INIT "-fPIC -DPIC")
- SET(CMAKE_C_FLAGS_DEBUG_INIT "-O0 -g")
- SET(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
- SET(CMAKE_C_FLAGS_RELEASE_INIT "-O2 -DNDEBUG")
- SET(CMAKE_Fortran_FLAGS_INIT "-fPIC")
- SET(CMAKE_Fortran_FLAGS_DEBUG_INIT "-O0 -g")
- SET(CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
- SET(CMAKE_Fortran_FLAGS_RELEASE_INIT "-O2")
- SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS_INIT "")
- SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS_INIT "")
-endif()
+#if (NOT WIN32)
+# #This all breaks on windows.
+# SET(CMAKE_Fortran_COMPILER_INIT ${CMAKE_GENERATOR_FC})
+# SET(CMAKE_CXX_FLAGS_INIT "-fPIC -DPIC")
+# SET(CMAKE_CXX_FLAGS_DEBUG_INIT "-O0 -g")
+# SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
+# SET(CMAKE_CXX_FLAGS_RELEASE_INIT "-O2 -DNDEBUG")
+# SET(CMAKE_C_FLAGS_INIT "-fPIC -DPIC")
+# SET(CMAKE_C_FLAGS_DEBUG_INIT "-O0 -g")
+# SET(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
+# SET(CMAKE_C_FLAGS_RELEASE_INIT "-O2 -DNDEBUG")
+# SET(CMAKE_Fortran_FLAGS_INIT "-fPIC")
+# SET(CMAKE_Fortran_FLAGS_DEBUG_INIT "-O0 -g")
+# SET(CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
+# SET(CMAKE_Fortran_FLAGS_RELEASE_INIT "-O2")
+# SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS_INIT "")
+# SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS_INIT "")
+#endif()
project( MOAB )
include(GNUInstallDirs)
@@ -281,11 +281,11 @@
# set( MOAB_DEFINES "-DNETCDF_FILE ${MOAB_DEFINES}" )
set (MOAB_HAVE_NETCDF ON)
set (MOAB_HAVE_NETCDF_H 1)
include_directories( ${NETCDF_INCLUDES} )
set( MOAB_LIBS ${NETCDF_LIBRARIES} ${MOAB_LIBS} )
- #
+ #
if ( PNETCDF_FOUND )
# find_package( PNetCDF REQUIRED )
set (MOAB_HAVE_PNETCDF ON)
include_directories( ${PNETCDF_INCLUDES} )
set( MOAB_LIBS ${PNETCDF_LIBRARIES} ${MOAB_LIBS} )
@@ -394,31 +394,31 @@
"${CMAKE_CURRENT_SOURCE_DIR}/config/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY
)
-enable_language(Fortran)
-
-# Include CMake's Fortran mangling evaluation macros
-include(FortranCInterface)
-
-if ("${FortranCInterface_GLOBAL_CASE}" MATCHES "UPPER")
- set(FC_CASE "NAME")
-else ("${FortranCInterface_GLOBAL_CASE}" MATCHES "UPPER")
- set(FC_CASE "name")
-endif ("${FortranCInterface_GLOBAL_CASE}" MATCHES "UPPER")
-if (NOT "${FortranCInterface_GLOBAL_SUFFIX}" STREQUAL "")
- set(FortranCInterface_GLOBAL_SUFFIX "## ${FortranCInterface_GLOBAL_SUFFIX}")
-endif (NOT "${FortranCInterface_GLOBAL_SUFFIX}" STREQUAL "")
-if (NOT "${FortranCInterface_GLOBAL__SUFFIX}" STREQUAL "")
- set(FortranCInterface_GLOBAL__SUFFIX "## ${FortranCInterface_GLOBAL__SUFFIX}")
-endif (NOT "${FortranCInterface_GLOBAL__SUFFIX}" STREQUAL "")
-
-set(MOAB_F77_FUNC "${FortranCInterface_GLOBAL_PREFIX} ${FC_CASE} ${FortranCInterface_GLOBAL_SUFFIX}")
-set(MOAB_F77_FUNC_ "${FortranCInterface_GLOBAL__PREFIX} ${FC_CASE} ${FortranCInterface_GLOBAL__SUFFIX}")
-set(MOAB_FC_FUNC "${FortranCInterface_GLOBAL_PREFIX} ${FC_CASE} ${FortranCInterface_GLOBAL_SUFFIX}")
-set(MOAB_FC_FUNC_ "${FortranCInterface_GLOBAL__PREFIX} ${FC_CASE} ${FortranCInterface_GLOBAL__SUFFIX}")
+#enable_language(Fortran)
+#
+## Include CMake's Fortran mangling evaluation macros
+#include(FortranCInterface)
+#
+#if ("${FortranCInterface_GLOBAL_CASE}" MATCHES "UPPER")
+# set(FC_CASE "NAME")
+#else ("${FortranCInterface_GLOBAL_CASE}" MATCHES "UPPER")
+# set(FC_CASE "name")
+#endif ("${FortranCInterface_GLOBAL_CASE}" MATCHES "UPPER")
+#if (NOT "${FortranCInterface_GLOBAL_SUFFIX}" STREQUAL "")
+# set(FortranCInterface_GLOBAL_SUFFIX "## ${FortranCInterface_GLOBAL_SUFFIX}")
+#endif (NOT "${FortranCInterface_GLOBAL_SUFFIX}" STREQUAL "")
+#if (NOT "${FortranCInterface_GLOBAL__SUFFIX}" STREQUAL "")
+# set(FortranCInterface_GLOBAL__SUFFIX "## ${FortranCInterface_GLOBAL__SUFFIX}")
+#endif (NOT "${FortranCInterface_GLOBAL__SUFFIX}" STREQUAL "")
+#
+#set(MOAB_F77_FUNC "${FortranCInterface_GLOBAL_PREFIX} ${FC_CASE} ${FortranCInterface_GLOBAL_SUFFIX}")
+#set(MOAB_F77_FUNC_ "${FortranCInterface_GLOBAL__PREFIX} ${FC_CASE} ${FortranCInterface_GLOBAL__SUFFIX}")
+#set(MOAB_FC_FUNC "${FortranCInterface_GLOBAL_PREFIX} ${FC_CASE} ${FortranCInterface_GLOBAL_SUFFIX}")
+#set(MOAB_FC_FUNC_ "${FortranCInterface_GLOBAL__PREFIX} ${FC_CASE} ${FortranCInterface_GLOBAL__SUFFIX}")
# Generate the CMake input header file and then pass it through configuration
## execute_process( COMMAND cat MOABConfig.h.in COMMAND sed -e "s/#undef /#cmakedefine MOAB_/g"
#execute_process( COMMAND cat MOABConfig.h.in COMMAND sed -r "s/#undef ([A-Z].*)/#cmakedefine MOAB_\\1 @MOAB_\\1@/"
# WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/config
......@@ -41,7 +41,7 @@ superbuild_add_project(smtk
DEBUGGABLE
DEFAULT_ON
INDEPENDENT_STEP_TARGETS ${smtk_lfs_steps} download update
DEPENDS boost cxx11 hdf5 netcdf nlohmannjson
DEPENDS boost cxx11 eigen hdf5 netcdf nlohmannjson
DEPENDS_OPTIONAL cgm cumulus gdal moab netcdf opencv paraview pybind11 python
matplotlib remus shiboken qt qt4 qt5 vtkonly vxl
CMAKE_ARGS
......@@ -69,6 +69,7 @@ superbuild_add_project(smtk
-DSMTK_ENABLE_MOAB_DISCRETE_READER:BOOL=OFF
-DSMTK_USE_SYSTEM_MOAB:BOOL=${moab_enabled}
-DMOAB_ROOT_DIR:PATH=<INSTALL_DIR>
-DMOAB_INCLUDE_DIR:PATH=<INSTALL_DIR>/include
# MOAB bits
......
......@@ -91,10 +91,15 @@ superbuild_set_revision(gdal
URL "http://www.computationalmodelbuilder.org/files/dependencies/gdal-98353693d6f1d607954220b2f8b040375e3d1744.tar.bz2"
URL_MD5 5aa285dcc856f98ce44020ae1ae192cb)
superbuild_set_revision(eigen
# https://bitbucket.org/eigen/eigen/get/034b6c3e1017.zip
URL "http://www.computationalmodelbuilder.org/files/dependencies/eigen-eigen-034b6c3e1017.zip"
URL_MD5 a2626b3815fa9b0982b4bd8d52583895)
superbuild_set_revision(moab
# https://gitlab.kitware.com/third-party/moab.git
URL "http://www.computationalmodelbuilder.org/files/dependencies/moab-17bf5518c4e6585a824edf06bc31902baf9ad045.tar.bz2"
URL_MD5 c1dd28514fc567b6e42acc12c2381ca4)
# https://bitbucket.org/fathomteam/moab.git
URL "http://www.computationalmodelbuilder.org/files/dependencies/moab-6425a480ffe8e08b96453618fc5530e08e68ae8a.tar.bz2"
URL_MD5 5946a405cddce972d54044fca6c87b11)
superbuild_set_revision(triangle
# https://github.com/robertmaynard/triangle.git
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment