mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-11 06:40:34 +00:00
Code Issues Projects Releases Wiki Activity

more cleanup; make use of cxxopts::cxxopts

Browse Source
This commit is contained in:
Bret Curtis 2023-04-27 14:19:53 +02:00
parent 45c4f8f6d9
commit 0e61ea15b5
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CI/before_script.msvc.sh
View File

@ -750,22 +750,6 @@ printf "Bullet ${BULLET_VER}... "
} }
cd $DEPS cd $DEPS
echo echo
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
export CXXOPTS_HOME="$(real_pwd)/cxxopts"
add_cmake_opts -DCXXOPTS_INCLUDE_DIR="${CXXOPTS_HOME}/include"
echo Done.
}
cd $DEPS
echo
printf "FFmpeg ${FFMPEG_VER}... " printf "FFmpeg ${FFMPEG_VER}... "
{ {
cd $DEPS_INSTALL cd $DEPS_INSTALL

1
CMakeLists.txt
View File

@ -368,7 +368,6 @@ option(OPENMW_USE_SYSTEM_CXXOPTS "Use system provided CXXOPTS library" ON)
if(OPENMW_USE_SYSTEM_CXXOPTS) if(OPENMW_USE_SYSTEM_CXXOPTS)
find_package(CXXOPTS REQUIRED) find_package(CXXOPTS REQUIRED)
endif() endif()
include_directories(SYSTEM ${CXXOPTS_INCLUDE_DIRS})
# Platform specific # Platform specific
if (WIN32) if (WIN32)

1
apps/mwiniimporter/CMakeLists.txt
View File

@ -15,6 +15,7 @@ openmw_add_executable(openmw-iniimporter
target_link_libraries(openmw-iniimporter target_link_libraries(openmw-iniimporter
components components
cxxopts::cxxopts
) )
if (WIN32) if (WIN32)