mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-04-28 21:07:59 +03:00
add cxxopts to cmake and 3 oses
This commit is contained in:
parent
d39d0447f5
commit
20aaf8ad2d
4 changed files with 23 additions and 2 deletions
|
@ -18,7 +18,7 @@ command -v cmake >/dev/null 2>&1 || brew install cmake
|
|||
command -v qmake >/dev/null 2>&1 || brew install qt@5
|
||||
|
||||
# Install deps
|
||||
brew install icu4c yaml-cpp sqlite
|
||||
brew install icu4c yaml-cpp sqlite cxxopts
|
||||
export PATH="/usr/local/opt/qt@5/bin:$PATH" # needed to use qmake in none default path as qt now points to qt6
|
||||
|
||||
ccache --version
|
||||
|
|
|
@ -554,6 +554,7 @@ if ! [ -z "$USE_CLANG_TIDY" ]; then
|
|||
fi
|
||||
|
||||
BULLET_VER="2.89"
|
||||
CXXOPTS_VER="v3.1.1"
|
||||
FFMPEG_VER="4.2.2"
|
||||
ICU_VER="70_1"
|
||||
LUAJIT_VER="v2.1.0-beta3-452-g7a0cf5fd"
|
||||
|
@ -594,6 +595,11 @@ if [ -z $SKIP_DOWNLOAD ]; then
|
|||
"boost-${BOOST_VER}-msvc${MSVC_VER}-win${BITS}.exe"
|
||||
fi
|
||||
|
||||
# cxxopts
|
||||
download "cxxopts ${CXXOPTS_VER}" \
|
||||
"https://github.com/jarro2783/cxxopts/archive/refs/tags/${CXXOPTS_VER}.zip" \
|
||||
"cxxopts-${CXXOPTS_VER}.zip"
|
||||
|
||||
# Bullet
|
||||
download "Bullet ${BULLET_VER}" \
|
||||
"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double-mt.7z" \
|
||||
|
@ -748,6 +754,19 @@ printf "Bullet ${BULLET_VER}... "
|
|||
add_cmake_opts -DBULLET_ROOT="$(real_pwd)/Bullet"
|
||||
echo Done.
|
||||
}
|
||||
printf "cxxopts ${CXXOPTS_VER}... "
|
||||
{
|
||||
cd $DEPS_INSTALL
|
||||
if [ -d cxxopts ]; then
|
||||
printf -- "Exists. (No version checking) "
|
||||
elif [ -z $SKIP_EXTRACT ]; then
|
||||
rm -rf cxxopts
|
||||
eval 7z x -y "${DEPS}/cxxopts-${CXXOPTS_VER}.zip" $STRIP
|
||||
mv "cxxopts-${CXXOPTS_VER}" cxxopts
|
||||
fi
|
||||
add_cmake_opts -DCXXOPTS_ROOT="$(real_pwd)/cxxopts"
|
||||
echo Done.
|
||||
}
|
||||
cd $DEPS
|
||||
echo
|
||||
printf "FFmpeg ${FFMPEG_VER}... "
|
||||
|
|
|
@ -34,7 +34,7 @@ declare -rA GROUPED_DEPS=(
|
|||
|
||||
libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev
|
||||
libsdl2-dev libqt5opengl5-dev libopenal-dev libunshield-dev libtinyxml-dev
|
||||
libbullet-dev liblz4-dev libpng-dev libjpeg-dev libluajit-5.1-dev
|
||||
libbullet-dev liblz4-dev libpng-dev libjpeg-dev libluajit-5.1-dev libcxxopts-dev
|
||||
librecast-dev libsqlite3-dev ca-certificates libicu-dev libyaml-cpp-dev
|
||||
"
|
||||
|
||||
|
|
|
@ -236,6 +236,8 @@ find_package(OpenGL REQUIRED)
|
|||
|
||||
find_package(LZ4 REQUIRED)
|
||||
|
||||
find_package(CXXOPTS REQUIRED)
|
||||
|
||||
if (USE_QT)
|
||||
find_package(QT REQUIRED COMPONENTS Core NAMES Qt6 Qt5)
|
||||
if (QT_VERSION_MAJOR VERSION_EQUAL 5)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue