Skip to content

Commit

Permalink
Dev (#8)
Browse files Browse the repository at this point in the history
* improve quiet mode

* minor fixed in quiet mode

* add slice algorithm

* fixed vcglib old eigen

* fixed eigenlib missing

* fixed incompatible /MTd /MDd

* correct the order of find_package in cmake

* fixed a lot of bugs in feret and convexhull

* fixed macos build

* fixed #3

* major fixed with slice analysis

* fixed point3d init

* add new program to fix self-intersect mesh

* fixed cmake and utils.h

* fixed #7

* fixed travis buil;d

* fixed travis build

* fixef travis
  • Loading branch information
nodtem66 authored Mar 13, 2020
1 parent 29b4346 commit c6e2a88
Show file tree
Hide file tree
Showing 6 changed files with 1,830 additions and 1,810 deletions.
39 changes: 27 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,39 @@
language: cpp
os: linux
dist: xenial
branches:
only:
- master
- dev
jobs:
include:
- os: linux
script:
- mkdir build && cd build
- cmake ..
- make
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-7
env: COMPILER=g++-7 CPP_VER=11
- os: osx
osx_image: xcode10
script:
- mkdir build && cd build
- cmake ..
- make
env: COMPILER=g++-7 CPP_VER=11
before_install:
- brew update
- brew install gcc@7
- os: windows
script:
- mkdir build && cd build
- cmake ..
- cmake --build .

install:
- if [[ "${COMPILER}" != "" ]]; then export CXX=${COMPILER}; fi
- ${CXX} --version

before_script:
- mkdir -p -v build
- cd build
- cmake ..

script:
- cmake --build .

notifications:
email: off
6 changes: 4 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ project ("Scaffolder")

set(CGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE ON)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

# libigl
option(LIBIGL_WITH_OPENGL "Use OpenGL" OFF)
Expand Down Expand Up @@ -46,5 +49,4 @@ target_include_directories(SliceTest PRIVATE "${PROJECT_SOURCE_DIR}/include" ${T
target_link_libraries(SliceTest PRIVATE igl::core tbb_static)

add_executable(Fixer ${MAIN_SOURCES} ${PROJECT_SOURCE_DIR}/src/FixSelfIntersect.cpp ${VCG_INCLUDE_DIR}/wrap/ply/plylib.cpp)
target_include_directories(Fixer PRIVATE "${PROJECT_SOURCE_DIR}/include" ${TBB_INCLUDE_DIR} ${VCG_INCLUDE_DIR})
target_link_libraries(Fixer PRIVATE)
target_include_directories(Fixer PRIVATE "${PROJECT_SOURCE_DIR}/include" ${VCG_INCLUDE_DIR})
Loading

0 comments on commit c6e2a88

Please sign in to comment.