Skip to content
This repository has been archived by the owner on Mar 25, 2024. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Add CGAL 4.7 to Travis
  • Loading branch information
Hugo Mercier committed Nov 10, 2015
1 parent d39e1ae commit 86a0d5b
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 14 deletions.
10 changes: 7 additions & 3 deletions .travis.yml
Expand Up @@ -5,15 +5,19 @@ language: cpp
# - osx

compiler:
- gcc
# - gcc
- clang

env:
# - CGAL_VERSION=4.3
- CGAL_VERSION=4.7

before_install:
- ./travis/${TRAVIS_OS_NAME}/before_install.sh
- ./travis/${TRAVIS_OS_NAME}/before_install.sh $CGAL_VERSION

before_script:
- cmake -DSFCGAL_BUILD_TESTS=ON

script:
- make
- make test
- ctest -VV
3 changes: 2 additions & 1 deletion cmake/Modules/FindCGAL.cmake
Expand Up @@ -24,7 +24,8 @@ if( CGAL_LIBRARY )
endif()

if(CGAL_FIND_VERSION)
find_file(version_file CGAL/version.h HINTS $ENV{CGAL_DIR}/include ${CGAL_DIR}/include ${CGAL_INCLUDE_DIRS} PATH_SUFFIXES CGAL)
message("CGAL_DIR ${CGAL_DIR}")
find_file(version_file version.h HINTS $ENV{CGAL_DIR}/include ${CGAL_DIR}/include ${CGAL_INCLUDE_DIRS} PATH_SUFFIXES CGAL)
file(STRINGS ${version_file} version_str REGEX "# *define +CGAL_VERSION +")
string( REGEX REPLACE "# *define +CGAL_VERSION +" "" CGAL_VERSION ${version_str})
if("${CGAL_VERSION}" VERSION_LESS "${CGAL_FIND_VERSION}")
Expand Down
2 changes: 2 additions & 0 deletions test/CMakeLists.txt
Expand Up @@ -18,3 +18,5 @@ if( SFCGAL_BUILD_BENCH )
add_subdirectory( bench )
endif()

# add a custom rule "check" that adds verbosity to ctest
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --verbose)
4 changes: 2 additions & 2 deletions test/garden/CMakeLists.txt
Expand Up @@ -17,9 +17,9 @@ set_target_properties( ${REGRESS_NAME} PROPERTIES DEBUG_POSTFIX "d" )
install( TARGETS ${REGRESS_NAME} DESTINATION bin )

if (CMAKE_BUILD_TYPE STREQUAL "Debug" )
add_test( garden-testd ${CMAKE_CURRENT_BINARY_DIR}/garden-test-SFCGALd )
add_test( garden-testd ${CMAKE_CURRENT_BINARY_DIR}/garden-test-SFCGALd --verbose)
else()
add_test( garden-test ${CMAKE_CURRENT_BINARY_DIR}/garden-test-SFCGAL )
add_test( garden-test ${CMAKE_CURRENT_BINARY_DIR}/garden-test-SFCGAL --verbose)
endif()


4 changes: 2 additions & 2 deletions test/regress/standalone/CMakeLists.txt
Expand Up @@ -15,9 +15,9 @@ set_target_properties( standalone-regress-test-SFCGAL PROPERTIES DEBUG_POSTFIX "
install( TARGETS standalone-regress-test-SFCGAL DESTINATION bin )

if (CMAKE_BUILD_TYPE STREQUAL "Debug" )
add_test( standalone-regress-testd ${CMAKE_CURRENT_BINARY_DIR}/standalone-regress-test-SFCGALd )
add_test( standalone-regress-testd ${CMAKE_CURRENT_BINARY_DIR}/standalone-regress-test-SFCGALd --auto_start_dbg=y --log_level=all)
else()
add_test( standalone-regress-test ${CMAKE_CURRENT_BINARY_DIR}/standalone-regress-test-SFCGAL )
add_test( standalone-regress-test ${CMAKE_CURRENT_BINARY_DIR}/standalone-regress-test-SFCGAL --auto_start_dbg=y --log_level=all)
endif()


4 changes: 2 additions & 2 deletions test/unit/CMakeLists.txt
Expand Up @@ -23,8 +23,8 @@ set_target_properties( unit-test-SFCGAL PROPERTIES DEBUG_POSTFIX "d" )
install( TARGETS unit-test-SFCGAL DESTINATION bin )

if (CMAKE_BUILD_TYPE STREQUAL "Debug" )
add_test( unit-testd ${CMAKE_CURRENT_BINARY_DIR}/unit-test-SFCGALd )
add_test( unit-testd ${CMAKE_CURRENT_BINARY_DIR}/unit-test-SFCGALd --auto_start_dbg=y --log_level=all)
else()
add_test( unit-test ${CMAKE_CURRENT_BINARY_DIR}/unit-test-SFCGAL )
add_test( unit-test ${CMAKE_CURRENT_BINARY_DIR}/unit-test-SFCGAL --auto_start_dbg=y --log_level=all)
endif()

16 changes: 12 additions & 4 deletions travis/linux/before_install.sh
@@ -1,15 +1,23 @@
export DEBIAN_FRONTEND=noninteractive
sudo add-apt-repository ppa:apokluda/boost1.53 --yes
sudo add-apt-repository ppa:kalakris/cmake --yes # CMAKE 2.8.11
sudo apt-get update -qq
sudo apt-get install --force-yes \
cmake libboost-chrono1.53-dev libboost-program-options1.53-dev libboost-filesystem1.53-dev libboost-timer1.53-dev \
libboost-test1.53-dev libboost-date-time1.53-dev libboost-thread1.53-dev \
libboost-system1.53-dev libboost-serialization1.53-dev \
libmpfr-dev libgmp-dev
libmpfr-dev libgmp-dev \
cmake
#CGAL
wget https://gforge.inria.fr/frs/download.php/file/32994/CGAL-4.3.tar.gz
tar xzf CGAL-4.3.tar.gz
cd CGAL-4.3 && cmake . && make && sudo make install && cd ..
if [ "$1" = "4.3" ]; then
wget https://gforge.inria.fr/frs/download.php/file/32994/CGAL-4.3.tar.gz
tar xzf CGAL-4.3.tar.gz
cd CGAL-4.3 && cmake . && make && sudo make install && cd ..
elif [ "$1" = "4.7" ]; then
wget https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.7/CGAL-4.7.tar.gz
tar xzf CGAL-4.7.tar.gz
cd CGAL-4.7 && cmake . && make && sudo make install && cd ..
fi


cmake --version
Expand Down
14 changes: 14 additions & 0 deletions travis/linux/install_cgal.sh
@@ -0,0 +1,14 @@
#CGAL
if [ "$1" = "4.3" ]; then
wget https://gforge.inria.fr/frs/download.php/file/32994/CGAL-4.3.tar.gz
tar xzf CGAL-4.3.tar.gz
cd CGAL-4.3 && cmake -DCMAKE_INSTALL_PREFIX=$HOME/CGAL-4.3 . && make && make install && cd ..
elif [ "$1" = "4.7" ]; then
wget https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.7/CGAL-4.7.tar.gz
tar xzf CGAL-4.7.tar.gz
cd CGAL-4.7 && cmake -DCMAKE_INSTALL_PREFIX=$HOME/CGAL-4.7 . && make && make install && cd ..
fi


cmake --version
clang --version

0 comments on commit 86a0d5b

Please sign in to comment.