diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 956c88595d8..00000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,99 +0,0 @@ -cache: - - C:\Tools\vcpkg\installed\ - - C:\Tools\ninja\ninja.exe - -configuration: Release - -environment: - VCPKG_DIR: C:\Tools\vcpkg - NINJA_DIR: C:\Tools\ninja - GENERATOR: Ninja - matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015' - PLATFORM: x86 - VCVARSALL: '%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat' - ARCHITECTURE: x86 - - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015' - PLATFORM: x64 - VCVARSALL: '%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat' - ARCHITECTURE: x86_amd64 - #- APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017' - # PLATFORM: x86 - # VCVARSALL: '%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat' - # ARCHITECTURE: x86 - #- APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017' - # PLATFORM: x64 - # VCVARSALL: '%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat' - # ARCHITECTURE: x86_amd64 - -init: - - cd %VCPKG_DIR% - - git pull - - echo.set(VCPKG_BUILD_TYPE release)>> %VCPKG_DIR%\triplets\%PLATFORM%-windows.cmake - - .\bootstrap-vcpkg.bat - - vcpkg version - - cd %APPVEYOR_BUILD_FOLDER% - -install: - - vcpkg install - boost-system - boost-filesystem - boost-thread - boost-date-time - boost-iostreams - boost-chrono - boost-asio - boost-dynamic-bitset - boost-foreach - boost-graph - boost-interprocess - boost-multi-array - boost-ptr-container - boost-random - boost-signals2 - eigen3 - flann - qhull - gtest - --triplet %PLATFORM%-windows - - vcpkg list - - set PATH=%VCPKG_DIR%\installed\%PLATFORM%-windows\bin;%PATH% - - if not exist %NINJA_DIR%\ mkdir %NINJA_DIR% - - cd %NINJA_DIR% - - if not exist ninja.exe appveyor DownloadFile https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip - - if not exist ninja.exe 7z x ninja-win.zip - - set PATH=%NINJA_DIR%;%PATH% - -build: - parallel: true - -build_script: - # These tests will fails on Windows. - # Therefore, these tests are disabled until fixed. - # AppVeyor Log : https://ci.appveyor.com/project/PointCloudLibrary/pcl/build/1.0.267 - # * common_eigen - # * feature_rift_estimation - # * feature_cppf_estimation - # * feature_pfh_estimation - - call "%VCVARSALL%" %ARCHITECTURE% - - cd %APPVEYOR_BUILD_FOLDER% - - mkdir build - - cd build - - cmake -G"%GENERATOR%" - -DCMAKE_C_COMPILER=cl.exe - -DCMAKE_CXX_COMPILER=cl.exe - -DCMAKE_TOOLCHAIN_FILE=%VCPKG_DIR%\scripts\buildsystems\vcpkg.cmake - -DVCPKG_APPLOCAL_DEPS=OFF - -DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32=ON - -DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=ON - -DPCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32=ON - -DPCL_NO_PRECOMPILE=OFF - -DBUILD_apps=OFF - -DBUILD_examples=OFF - -DBUILD_global_tests=ON - -DBUILD_simulation=OFF - -DBUILD_tools=OFF - .. - - cmake --build . --config %CONFIGURATION% - - ctest -C %CONFIGURATION% -V - diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index ae65b32b8d7..a0715f7dcbb 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -87,3 +87,44 @@ jobs: git push --force displayName: 'Push Generated Documentation To GitHub' condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') + - job: vs2017 + displayName: Windows VS2017 Build + timeoutInMinutes: 0 + pool: + vmImage: 'vs2017-win2016' + strategy: + matrix: + x86: + PLATFORM: 'x86' + ARCHITECTURE: 'x86' + GENERATOR: 'Visual Studio 15 2017' + x64: + PLATFORM: 'x64' + ARCHITECTURE: 'x86_amd64' + GENERATOR: 'Visual Studio 15 2017 Win64' + variables: + BUILD_DIR: '$(Agent.WorkFolder)\build' + VCPKG_DIR: '$(Agent.WorkFolder)\vcpkg' + VCVARSALL: '%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat' + CONFIGURATION: 'Release' + steps: + - script: | + git clone https://github.com/microsoft/vcpkg --depth 1 %VCPKG_DIR% + echo.set(VCPKG_BUILD_TYPE release)>> %VCPKG_DIR%\triplets\%PLATFORM%-windows.cmake + %VCPKG_DIR%\bootstrap-vcpkg.bat + %VCPKG_DIR%\vcpkg.exe version + displayName: Bootstrap vcpkg + - script: | + %VCPKG_DIR%\vcpkg.exe install boost-system boost-filesystem boost-thread boost-date-time boost-iostreams boost-chrono boost-asio boost-dynamic-bitset boost-foreach boost-graph boost-interprocess boost-multi-array boost-ptr-container boost-random boost-signals2 eigen3 flann gtest qhull --triplet %PLATFORM%-windows + %VCPKG_DIR%\vcpkg.exe list + displayName: Install Dependencies + - script: | + call "%VCVARSALL%" %ARCHITECTURE% + set PATH=%VCPKG_DIR%\installed\%PLATFORM%-windows\bin;%PATH% + mkdir %BUILD_DIR% && cd %BUILD_DIR% + cmake $(Build.SourcesDirectory) -G"%GENERATOR%" -DCMAKE_TOOLCHAIN_FILE=%VCPKG_DIR%\scripts\buildsystems\vcpkg.cmake -DVCPKG_APPLOCAL_DEPS=ON -DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32=ON -DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=ON -DPCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32=ON -DBUILD_global_tests=ON -DBUILD_tools=OFF -DBUILD_surface_on_nurbs=ON + displayName: 'CMake Configuration' + - script: cd %BUILD_DIR% && cmake --build . --config %CONFIGURATION% + displayName: 'Build Library' + - script: cd %BUILD_DIR% && ctest -C %CONFIGURATION% -V + displayName: 'Run Unit Tests' diff --git a/README.md b/README.md index 75508d7b83d..416d7bcb2d0 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,6 @@ Continuous integration [license]: https://github.com/PointCloudLibrary/pcl/blob/master/LICENSE.txt [![Build Status](https://dev.azure.com/PointCloudLibrary/pcl/_apis/build/status/PointCloudLibrary.pcl)](https://dev.azure.com/PointCloudLibrary/pcl/_build/latest?definitionId=1) -[![Build Status](https://ci.appveyor.com/api/projects/status/oiep6oktpmuap7qr/branch/master?svg=true)](https://ci.appveyor.com/project/PointCloudLibrary/pcl/branch/master) Description -----------