more cleanup; make use of cxxopts::cxxopts

CI/before_script.msvc.sh

@@ -750,22 +750,6 @@ printf "Bullet ${BULLET_VER}... "
 }
 cd $DEPS
 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}... "
 {
 	cd $DEPS_INSTALL

CMakeLists.txt

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

apps/mwiniimporter/CMakeLists.txt

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