Mentions légales du service

Skip to content
Snippets Groups Projects
Commit a11b49c0 authored by hhakim's avatar hhakim
Browse files

Remove erroneous USE_MATIO_STATIC_LIBS option from pkg_win_realease ci job +...

Remove erroneous USE_MATIO_STATIC_LIBS option from pkg_win_realease ci job + add MATIO_LIB_FILE option for python build cmake too.

Setting again the MATIO_LIB_FILE option is necessary because it is not kept from the previous matlab build.
parent 8a1042f8
No related branches found
No related tags found
No related merge requests found
Pipeline #834105 skipped
...@@ -161,7 +161,7 @@ pkg_win: ...@@ -161,7 +161,7 @@ pkg_win:
- cmake --build . --config %BUILD_CONFIG% - cmake --build . --config %BUILD_CONFIG%
# now build pyfaust too # now build pyfaust too
# specifying a consistent python version with pkg_win_purepy_rev # specifying a consistent python version with pkg_win_purepy_rev
- cmake -DBUILD_WRAPPER_PYTHON=ON .. - cmake -DBUILD_WRAPPER_PYTHON=ON -DMATIO_LIB_FILE=C:/faust_libs/libmatio_standalone.lib ..
- cd wrapper\python - cd wrapper\python
- py -%WIN_PY_VER% setup.py build_ext --inplace # normally it costs no time of building because pkg_win_purepy_rev already compiled the .pyd lib - py -%WIN_PY_VER% setup.py build_ext --inplace # normally it costs no time of building because pkg_win_purepy_rev already compiled the .pyd lib
- cd ..\.. - cd ..\..
...@@ -292,11 +292,11 @@ pkg_win_release: ...@@ -292,11 +292,11 @@ pkg_win_release:
#- 'cmake -G "MinGW Makefiles" -DBUILD_WRAPPER_MATLAB=ON -DBUILD_WRAPPER_PYTHON=ON -DSLOW_TESTS=OFF -DCPACK_PACKAGE_VERSION=%CI_COMMIT_TAG% -DBUILD_DOCUMENTATION=ON -DEXCLUDE_FAUST_LIB_INSTALL=ON -DCMAKE_INSTALL_PREFIX=win_pkg_build -DBUILD_TESTING=OFF -DAPI_DOC_BASE_URL="file:///C:/Program Files/Faust/doc/" -DREMOTE_DATA_URL="%DURL%" -DREMOTE_DATA_FILE="%DFILE%" -DUSE_GPU_MOD=ON -DCMAKE_PREFIX_PATH=../gpu_mod ..' #- 'cmake -G "MinGW Makefiles" -DBUILD_WRAPPER_MATLAB=ON -DBUILD_WRAPPER_PYTHON=ON -DSLOW_TESTS=OFF -DCPACK_PACKAGE_VERSION=%CI_COMMIT_TAG% -DBUILD_DOCUMENTATION=ON -DEXCLUDE_FAUST_LIB_INSTALL=ON -DCMAKE_INSTALL_PREFIX=win_pkg_build -DBUILD_TESTING=OFF -DAPI_DOC_BASE_URL="file:///C:/Program Files/Faust/doc/" -DREMOTE_DATA_URL="%DURL%" -DREMOTE_DATA_FILE="%DFILE%" -DUSE_GPU_MOD=ON -DCMAKE_PREFIX_PATH=../gpu_mod ..'
# - make # - make
# build first only matfaust # build first only matfaust
- 'cmake -G "Visual Studio 16 2019" -DBUILD_WRAPPER_MATLAB=ON -DBUILD_WRAPPER_PYTHON=OFF -DSLOW_TESTS=OFF -DCPACK_PACKAGE_VERSION=%CI_COMMIT_TAG% -DBUILD_DOCUMENTATION=ON -DEXCLUDE_FAUST_LIB_INSTALL=ON -DCMAKE_INSTALL_PREFIX=win_pkg_build -DBUILD_TESTING=OFF -DUSE_MATIO_STATIC_LIBS=ON -DMATIO_LIB_FILE=C:/faust_libs/libmatio_standalone.lib -DAPI_DOC_BASE_URL="file:///C:/Program Files/Faust/doc/" -DREMOTE_DATA_URL="%DURL%" -DREMOTE_DATA_FILE="%DFILE%" -DEXPERIMENTAL_PKG=OFF -DUSE_GPU_MOD=ON -DCMAKE_PREFIX_PATH=../gpu_mod -DPYTHON_ENCODING=windows-1252 -DBUILD_MULTITHREAD=ON -DBUILD_FLOAT_PYX=ON -DBUILD_FLOAT_MEX=ON -DCMAKE_BUILD_TYPE=%BUILD_CONFIG% -DVCOMPLIB_PATH=C:\faust_libs\vcomp140.dll ..' - 'cmake -G "Visual Studio 16 2019" -DBUILD_WRAPPER_MATLAB=ON -DBUILD_WRAPPER_PYTHON=OFF -DSLOW_TESTS=OFF -DCPACK_PACKAGE_VERSION=%CI_COMMIT_TAG% -DBUILD_DOCUMENTATION=ON -DEXCLUDE_FAUST_LIB_INSTALL=ON -DCMAKE_INSTALL_PREFIX=win_pkg_build -DBUILD_TESTING=OFF -DMATIO_LIB_FILE=C:/faust_libs/libmatio_standalone.lib -DAPI_DOC_BASE_URL="file:///C:/Program Files/Faust/doc/" -DREMOTE_DATA_URL="%DURL%" -DREMOTE_DATA_FILE="%DFILE%" -DEXPERIMENTAL_PKG=OFF -DUSE_GPU_MOD=ON -DCMAKE_PREFIX_PATH=../gpu_mod -DPYTHON_ENCODING=windows-1252 -DBUILD_MULTITHREAD=ON -DBUILD_FLOAT_PYX=ON -DBUILD_FLOAT_MEX=ON -DCMAKE_BUILD_TYPE=%BUILD_CONFIG% -DVCOMPLIB_PATH=C:\faust_libs\vcomp140.dll ..'
- cmake --build . --config Release - cmake --build . --config Release
# now build pyfaust too # now build pyfaust too
# specifying a consistent python version with pkg_win_purepy_rev # specifying a consistent python version with pkg_win_purepy_rev
- cmake -DBUILD_WRAPPER_PYTHON=ON .. - cmake -DBUILD_WRAPPER_PYTHON=ON -DMATIO_LIB_FILE=C:/faust_libs/libmatio_standalone.lib ..
- cd wrapper\python - cd wrapper\python
- py -%WIN_PY_VER% setup.py build_ext --inplace # normally it costs no time of building because pkg_win_purepy_release already compiled the .pyd lib - py -%WIN_PY_VER% setup.py build_ext --inplace # normally it costs no time of building because pkg_win_purepy_release already compiled the .pyd lib
- cd ..\.. - cd ..\..
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment