zcy
/
dust3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix appveyor

master
huxingyi 2018-04-13 21:16:29 -07:00
parent afd1e8ccca
commit 70f9f7c003
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@ -36,7 +36,7 @@ test_script:
- if "%PLATFORM%" == "x64" - if "%PLATFORM%" == "x64"
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
- set PATH=%PATH%;%QTDIR%\bin - set PATH=%PATH%;%QTDIR%\bin
- qmake "DEFINES+=BOOST_INCLUDEDIR=C:\Libraries\boost_1_66_0" "DEFINES+=CGAL_DIR=%APPVEYOR_BUILD_FOLDER%\CGAL-4.11.1" - qmake "BOOST_INCLUDEDIR=C:\Libraries\boost_1_66_0" "CGAL_DIR=%APPVEYOR_BUILD_FOLDER%\CGAL-4.11.1"
- nmake -f Makefile.Release - nmake -f Makefile.Release
after_test: after_test:

10
dust3d.pro
View File

@ -86,9 +86,13 @@ SOURCES += src/main.cpp
HEADERS += src/version.h HEADERS += src/version.h
win32 { win32 {
BOOST_INCLUDEDIR = $$(BOOST_INCLUDEDIR) isEmpty(BOOST_INCLUDEDIR) {
CGAL_DIR = $$(CGAL_DIR) BOOST_INCLUDEDIR = $$(BOOST_INCLUDEDIR)
}
isEmpty(CGAL_DIR) {
CGAL_DIR = $$(CGAL_DIR)
}
isEmpty(BOOST_INCLUDEDIR) { isEmpty(BOOST_INCLUDEDIR) {
error("No BOOST_INCLUDEDIR define found in enviroment variables") error("No BOOST_INCLUDEDIR define found in enviroment variables")
} }