Skip to content

Commit

Permalink
appveyor fix #4
Browse files Browse the repository at this point in the history
  • Loading branch information
mamoll committed Jul 30, 2015
1 parent 6686801 commit adbc7bf
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 8 deletions.
23 changes: 16 additions & 7 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ branches:
- master

# build platform, i.e. x86, x64, Any CPU. This setting is optional.
platform: x64
platform:
#- Win32
- x64

environment:
CTEST_OUTPUT_ON_FAILURE: 1
Expand All @@ -23,12 +25,19 @@ configuration:
# - Debug
- Release

build_script:
- set
- mkdir build
- cd build
- cmake -DOMPL_REGISTRATION=OFF -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%" -DBoost_USE_STATIC_LIBS=ON ..
- cmake --build .
before_build:
- cmd: set
- cmd: mkdir build
- cmd: cd build
- cmd: if "%platform%"=="Win32" set CMAKE_GENERATOR_NAME=Visual Studio 12
- cmd: if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=Visual Studio 12 Win64
- cmd: cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration% -DOMPL_REGISTRATION=OFF -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%" -DBoost_USE_STATIC_LIBS=ON ..

build:
project: c:\projects\ompl\build\ompl.sln
parallel: true
# MSBuild verbosity level (quiet|minimal|normal|detailed)
verbosity: detailed

test_script:
- cmd: ctest
4 changes: 3 additions & 1 deletion src/ompl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ file(GLOB_RECURSE OMPL_SOURCE_CODE datastructures/*.cpp util/*.cpp base/*.cpp ge
if(NOT OMPL_HAVE_EIGEN3)
list(REMOVE_ITEM OMPL_SOURCE_CODE
"${VERSION_DIR}/util/src/ProlateHyperspheroid.cpp"
"${VERSION_DIR}/base/samplers/informed/src/PathLengthDirectInfSampler.cpp")
"${VERSION_DIR}\\util\\src/ProlateHyperspheroid.cpp"
"${VERSION_DIR}/base/samplers/informed/src/PathLengthDirectInfSampler.cpp"
"${VERSION_DIR}\\base\\samplers\\informed\\src\\PathLengthDirectInfSampler.cpp")
endif()

#############################################
Expand Down

0 comments on commit adbc7bf

Please sign in to comment.