Skip to content

Commit

Permalink
Merge pull request #228 from SCIInstitute/fixTetgen
Browse files Browse the repository at this point in the history
Try updating tetgen
  • Loading branch information
dcwhite committed Jul 6, 2017
2 parents c753545 + f15302f commit bf1a0e7
Showing 1 changed file with 26 additions and 8 deletions.
34 changes: 26 additions & 8 deletions Superbuild/TetgenExternal.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,34 @@ SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})

SET(TETGEN_LIBRARY "tet")

IF(TRAVIS_BUILD OR ${CMAKE_VERSION} VERSION_GREATER 3.7.2)
# allowed since CMake 3.7.2
# only supporting in CI builds for now, since CMake version is so new
SET(DOWNLOAD_URL "http://tetgen.org/files/tetgen1.4.3.tar.gz http://www.sci.utah.edu/devbuilds/seg3d/tetgen1.4.3.tar.gz")
ELSE()
SET(DOWNLOAD_URL "http://tetgen.org/files/tetgen1.4.3.tar.gz")
ENDIF()
# IF(TRAVIS_BUILD OR ${CMAKE_VERSION} VERSION_GREATER 3.7.2)
# # allowed since CMake 3.7.2
# # only supporting in CI builds for now, since CMake version is so new
# SET(DOWNLOAD_URL "http://tetgen.org/files/tetgen1.4.3.tar.gz http://www.sci.utah.edu/devbuilds/seg3d/tetgen1.4.3.tar.gz")
# ELSE()
# SET(DOWNLOAD_URL "http://tetgen.org/files/tetgen1.4.3.tar.gz")
# ENDIF()

# ExternalProject_Add(Tetgen_external
# URL ${DOWNLOAD_URL}
# PATCH_COMMAND ""
# INSTALL_COMMAND ""
# CMAKE_CACHE_ARGS
# -DCMAKE_VERBOSE_MAKEFILE:BOOL=${CMAKE_VERBOSE_MAKEFILE}
# -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
# -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
# -DTETGEN_LIBRARY:STRING=${TETGEN_LIBRARY}
# )


SET(tetgen_SVN_URL "https://gforge.sci.utah.edu/svn/tetgen")
#SET(sci_data_DIR "${CMAKE_BINARY_DIR}/SCIRunData")

ExternalProject_Add(Tetgen_external
URL ${DOWNLOAD_URL}
SVN_REPOSITORY "${tetgen_SVN_URL}"
SVN_TRUST_CERT 1
SVN_USERNAME "anonymous"
SVN_PASSWORD ""
PATCH_COMMAND ""
INSTALL_COMMAND ""
CMAKE_CACHE_ARGS
Expand Down

0 comments on commit bf1a0e7

Please sign in to comment.