Fixed libcsptr not being detected in the CI cmake script
This commit is contained in:
parent
a58dd92c84
commit
90bacdd603
3 changed files with 4 additions and 2 deletions
|
@ -8,7 +8,7 @@ git clone --branch ${tag} --depth 1 ${repo} dependencies/libcsptr &&
|
|||
cd dependencies/libcsptr &&
|
||||
mkdir build &&
|
||||
cd $_ &&
|
||||
cmake -DCMAKE_INSTALL_PREFIX=$HOME "$@" .. &&
|
||||
cmake -DCMAKE_INSTALL_PREFIX=$LOCAL_INSTALL "$@" .. &&
|
||||
make &&
|
||||
make install
|
||||
)
|
||||
|
|
|
@ -9,6 +9,7 @@ addons:
|
|||
- gettext
|
||||
- cmake
|
||||
before_install:
|
||||
- export LOCAL_INSTALL="$HOME"
|
||||
- ".ci/install-libcsptr.sh"
|
||||
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/lib
|
||||
- export CFLAGS="-g -O0"
|
||||
|
|
|
@ -22,9 +22,10 @@ configuration: Release
|
|||
|
||||
install:
|
||||
- 'set GCOV_PREFIX=%APPVEYOR_BUILD_FOLDER%'
|
||||
- 'set LOCAL_INSTALL=%APPVEYOR_BUILD_FOLDER%'
|
||||
- 'bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; .ci/install-libcsptr.sh -G \"MSYS Makefiles\"; true"'
|
||||
- 'cd dependencies/libcsptr/build && make && make install && cd ../../../'
|
||||
- 'mkdir build && cd build && cmake -DCMAKE_PREFIX_PATH=%HOME% -G "MSYS Makefiles" ..'
|
||||
- 'mkdir build && cd build && cmake -DCMAKE_PREFIX_PATH="%LOCAL_INSTALL%" -G "MSYS Makefiles" ..'
|
||||
|
||||
build_script:
|
||||
- 'make'
|
||||
|
|
Loading…
Add table
Reference in a new issue