Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build directly with CMake on non-MSVC systems. #1234

Merged
merged 2 commits into from
Aug 8, 2023
Merged

Build directly with CMake on non-MSVC systems. #1234

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c0a215
Try building with CMake only on non-windows systems.
mahge Aug 8, 2023
6d09a7f
Use CMake directly on MSYS too.
mahge Aug 8, 2023
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
8 changes: 4 additions & 4 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,8 +717,8 @@ void buildOMS() {
echo export MAKETHREADS=-j%NUMBER_OF_PROCESSORS%
echo set -ex
echo git fetch --tags
echo time make config-OMSimulator -j%NUMBER_OF_PROCESSORS% ${env.OMSFLAGS ?: ""}
echo time make OMSimulator -j%NUMBER_OF_PROCESSORS% ${env.OMSFLAGS ?: ""}
echo cmake -S . -B build/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install/ -G "MSYS Makefiles"
echo cmake --build build/ --parallel %NUMBER_OF_PROCESSORS% --target install -v
) > buildOMSimulatorWindows.sh

set MSYSTEM=${env.MSYSTEM ? env.MSYSTEM : "MINGW64"}
Expand All @@ -732,8 +732,8 @@ void buildOMS() {
${env.SHELLSTART ?: ""}
export HOME="${'$'}PWD"
git fetch --tags
make config-OMSimulator -j${nproc} ${env.ASAN ? "ASAN=ON" : ""} ${env.OMSFLAGS ?: ""}
make OMSimulator -j${nproc} ${env.ASAN ? "DISABLE_RUN_OMSIMULATOR_VERSION=1" : ""} ${env.OMSFLAGS ?: ""}
cmake -S . -B build/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install/
cmake --build build/ --parallel ${nproc} --target install -v
"""
}
}
Expand Down