Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions appveyor_mingw.yml → appveyor_linux.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 4.0.3-{branch}-ci-{build}
version: 4.0.10-{branch}-ci-{build}

branches:
only:
Expand Down Expand Up @@ -138,12 +138,11 @@ environment:
install:
- sh: |
sudo apt-get -y update
sudo apt-get -y install freeglut3-dev
sudo apt-get -y install doxygen jq
sudo apt-get -y install freeglut3-dev doxygen jq ninja
cd $APPVEYOR_BUILD_FOLDER
- cmd: |
choco install jq
rem Work around for outdated curl version giving problems with GitHub Authentication when redirected.
rem Work around for outdated curl version giving problems with GitHub authentication when redirected.
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" set PATH=C:\msys64\%COMPILER_ID%\bin;C:\msys64\usr\bin\;%PATH%
curl --version
cd %APPVEYOR_BUILD_FOLDER%
Expand All @@ -156,6 +155,7 @@ before_build:
rem we need this update, as we need to ensure every dependent package uses the same compiler and environment
C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -Syu"
C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -Syu"
C:\msys64\usr\bin\bash -lc "pacman -S --noconfirm mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja"
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" for /f %%i in ('gcc -dumpversion') do set GCC_VERSION=%%i
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" set COMPILER_ID=mingw-gcc%GCC_VERSION:.=%
if defined APPVEYOR_REPO_TAG_NAME (set CI_REPO_VERSION=%APPVEYOR_REPO_TAG_NAME:~1%) else (set CI_REPO_VERSION=latest)
Expand All @@ -175,9 +175,10 @@ before_build:
curl -s -S -L -H "Authorization: token %GH_AUTH_TOKEN%" -H "Accept: application/octet-stream" -o %DOWNLOAD_FILE_SUPERGLU% %DOWNLOAD_ADDRESS_SUPERGLU%
7z x %DOWNLOAD_FILE_SUPERGLU% -o%APPVEYOR_BUILD_FOLDER%\downloads
rem ##############
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" cmake -H. -Bbuild_debug -G "%CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_POSITION_INDEPENDENT_CODE=true -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/Coin3D -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/downloads/Coin3D -DUSE_SUPERGLU=ON
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" cmake -H. -Bbuild_release -G "%CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=true -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/Coin3D -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/downloads/Coin3D -DUSE_SUPERGLU=ON
if not "%CMAKE_GENERATOR%" == "MSYS Makefiles" cmake -H. -Bbuild -G "%CMAKE_GENERATOR%" -A %CMAKE_ARCHITECTURE% -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%\Coin3D -DUSE_SUPERGLU=ON
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" cmake -S . -B build_debug -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_POSITION_INDEPENDENT_CODE=true -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/Coin3D -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/downloads/Coin3D -DUSE_SUPERGLU=ON
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" cmake -S . -B build_release -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=true -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/Coin3D -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/downloads/Coin3D -DUSE_SUPERGLU=ON
if not "%CMAKE_GENERATOR%" == "MSYS Makefiles" cmake -S . -B build_debug -G "%CMAKE_GENERATOR%" -A %CMAKE_ARCHITECTURE% -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%\Coin3D -DUSE_SUPERGLU=ON
if not "%CMAKE_GENERATOR%" == "MSYS Makefiles" cmake -S . -B build_release -G "%CMAKE_GENERATOR%" -A %CMAKE_ARCHITECTURE% -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%\Coin3D -DUSE_SUPERGLU=ON
- sh: |
if [ -n "${APPVEYOR_REPO_TAG_NAME}" ]; then export CI_REPO_VERSION=${APPVEYOR_REPO_TAG_NAME:1}; else export CI_REPO_VERSION=latest; fi
BUILD_SOURCE_ARCHIVE=$APPVEYOR_PROJECT_NAME-$CI_REPO_VERSION-src.tar.gz
Expand All @@ -203,18 +204,18 @@ before_build:
###############
export CFLAGS=$CMAKE_ARCH_FLAGS
export CXXFLAGS=$CMAKE_ARCH_FLAGS
cmake -H. -Bbuild_debug -G "$CMAKE_GENERATOR" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_POSITION_INDEPENDENT_CODE=true -DCMAKE_INSTALL_PREFIX=$APPVEYOR_BUILD_FOLDER/Coin3D
cmake -H. -Bbuild_release -G "$CMAKE_GENERATOR" -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=true -DCMAKE_INSTALL_PREFIX=$APPVEYOR_BUILD_FOLDER/Coin3D
cmake -S . -B build_debug -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_POSITION_INDEPENDENT_CODE=true -DCMAKE_INSTALL_PREFIX=$APPVEYOR_BUILD_FOLDER/Coin3D
cmake -S . -B build_release -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=true -DCMAKE_INSTALL_PREFIX=$APPVEYOR_BUILD_FOLDER/Coin3D

build_script:
- cmd: |
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" cmake --build build_debug --target install --config Debug --parallel
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" cmake --build build_release --target install --config Release --parallel
if not "%CMAKE_GENERATOR%" == "MSYS Makefiles" cmake --build build --target INSTALL --config Debug --parallel
if not "%CMAKE_GENERATOR%" == "MSYS Makefiles" cmake --build build --target INSTALL --config Release --parallel
if not "%CMAKE_GENERATOR%" == "MSYS Makefiles" cmake --build build_debug --target INSTALL --config Debug --parallel
if not "%CMAKE_GENERATOR%" == "MSYS Makefiles" cmake --build build_release --target INSTALL --config Release --parallel
- sh: |
cmake --build build_debug --target install --config Debug --parallel
cmake --build build_release --target install --config Release --parallel
cmake --build build_debug --target install --parallel
cmake --build build_release --target install --parallel

after_build:
- cmd: |
Expand Down
12 changes: 6 additions & 6 deletions appveyor_macos.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 4.0.3-{branch}-ci-{build}
version: 4.0.10-{branch}-ci-{build}

branches:
only:
Expand Down Expand Up @@ -45,7 +45,7 @@ environment:

install:
- sh: |
HOMEBREW_NO_AUTO_UPDATE=1 brew install jq
HOMEBREW_NO_AUTO_UPDATE=1 brew install jq ninja
#brew install doxygen
- git submodule update --init --recursive

Expand All @@ -65,13 +65,13 @@ before_build:
export COMPILER_ID=$APPVEYOR_BUILD_WORKER_IMAGE-$COMPILER_ID`$COMPILER_ID -v 2>&1 | grep version | sed 's/^.*version \([0-9]*\)\.[0-9]*\.[0-9]*.*$/\1/g'`
export CFLAGS=$CMAKE_ARCH_FLAGS
export CXXFLAGS=$CMAKE_ARCH_FLAGS
#cmake -H. -Bbuild_debug -G "$CMAKE_GENERATOR" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_POSITION_INDEPENDENT_CODE=true -DCMAKE_INSTALL_PREFIX=$APPVEYOR_BUILD_FOLDER/Coin3D -DCMAKE_CXX_STANDARD=11
cmake -H. -Bbuild_release -G "$CMAKE_GENERATOR" -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=true -DCMAKE_INSTALL_PREFIX=$APPVEYOR_BUILD_FOLDER/Coin3D -DCMAKE_CXX_STANDARD=11
#cmake -S . -B build_debug -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_POSITION_INDEPENDENT_CODE=true -DCMAKE_INSTALL_PREFIX=$APPVEYOR_BUILD_FOLDER/Coin3D -DCMAKE_CXX_STANDARD=11
cmake -S . -B build_release -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=true -DCMAKE_INSTALL_PREFIX=$APPVEYOR_BUILD_FOLDER/Coin3D -DCMAKE_CXX_STANDARD=11

build_script:
- sh: |
#cmake --build build_debug --target install --config Debug --parallel
cmake --build build_release --target install --config Release --parallel
#cmake --build build_debug --target install --parallel
cmake --build build_release --target install --parallel

after_build:
- sh: |
Expand Down
220 changes: 0 additions & 220 deletions appveyor_newcomp.yml

This file was deleted.

Loading