From 0e61ea15b54421371d560c18e1925b2ad0938935 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 27 Apr 2023 14:19:53 +0200
Subject: [PATCH] more cleanup; make use of cxxopts::cxxopts

---
 CI/before_script.msvc.sh          | 16 ----------------
 CMakeLists.txt                    |  1 -
 apps/mwiniimporter/CMakeLists.txt |  1 +
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 52e1ac5357..5b79f4304d 100644
--- a/CI/before_script.msvc.sh
+++ b/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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b863f0e276..cd4a504ad2 100644
--- a/CMakeLists.txt
+++ b/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)
diff --git a/apps/mwiniimporter/CMakeLists.txt b/apps/mwiniimporter/CMakeLists.txt
index b7b7b33723..fe1fad23f8 100644
--- a/apps/mwiniimporter/CMakeLists.txt
+++ b/apps/mwiniimporter/CMakeLists.txt
@@ -15,6 +15,7 @@ openmw_add_executable(openmw-iniimporter
 
 target_link_libraries(openmw-iniimporter
     components
+    cxxopts::cxxopts
 )
 
 if (WIN32)