Trying to fix dyncall installation on windows
This commit is contained in:
parent
d8668e3ed8
commit
e0948aba7a
3 changed files with 14 additions and 3 deletions
9
.ci/install-dyncall.bat
Executable file
9
.ci/install-dyncall.bat
Executable file
|
@ -0,0 +1,9 @@
|
|||
set repo="https://github.com/Snaipe/dyncall.git"
|
||||
set tag="master"
|
||||
|
||||
mkdir dependencies
|
||||
git clone --branch %tag% --depth 1 %repo% dependencies/dyncall
|
||||
cd dependencies/dyncall
|
||||
mkdir build && cd build
|
||||
cmake -DCMAKE_INSTALL_PREFIX=%LOCAL_INSTALL% -G "NMake Makefiles" ..
|
||||
nmake
|
|
@ -6,7 +6,9 @@ mkdir -p dependencies
|
|||
git clone --branch ${tag} --depth 1 ${repo} dependencies/dyncall &&
|
||||
(
|
||||
cd dependencies/dyncall &&
|
||||
./configure --prefix=$LOCAL_INSTALL
|
||||
mkdir build &&
|
||||
cd $_ &&
|
||||
cmake -DCMAKE_INSTALL_PREFIX=$LOCAL_INSTALL "$@" .. &&
|
||||
make &&
|
||||
make install
|
||||
)
|
||||
|
|
|
@ -28,11 +28,11 @@ install:
|
|||
# Hack to make git think it is on the tip of the repo branch
|
||||
- 'git checkout -B %APPVEYOR_REPO_BRANCH%'
|
||||
# Install dependencies
|
||||
- 'bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; .ci/install-dyncall.sh; true"'
|
||||
- 'bash -lc "cd $APPVEYOR_BUILD_FOLDER; .ci/install-dyncall.sh -G \"MSYS Makefiles\"; true"'
|
||||
- 'bash -lc "cd $APPVEYOR_BUILD_FOLDER; .ci/install-libcsptr.sh -G \"MSYS Makefiles\"; true"'
|
||||
# We need to manually make since the above command somehow crashes
|
||||
- 'cd dependencies/libcsptr/build && make && make install && cd ../../../'
|
||||
- 'cd dependencies/dyncall/build && make && make install && cd ../../../'
|
||||
- 'cd dependencies/dyncall/build && make && make install && cd ../../../'
|
||||
# Configure project
|
||||
- 'mkdir build && cd build'
|
||||
- 'cmake -DCMAKE_INSTALL_PREFIX=criterion-%APPVEYOR_REPO_TAG_NAME% -DCMAKE_PREFIX_PATH="%LOCAL_INSTALL%" -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -G "MSYS Makefiles" ..'
|
||||
|
|
Loading…
Add table
Reference in a new issue