From dd241dd1cd2c7c5fd11ece6440c94809a8d227cf Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Wed, 26 Apr 2023 13:36:00 +0200 Subject: [PATCH] remove boost stuff from mwiiniimporter cmake; set include path in windows --- CI/before_script.msvc.sh | 1 + apps/mwiniimporter/CMakeLists.txt | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index e39edcd6d6..0abf522280 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -765,6 +765,7 @@ printf "cxxopts ${CXXOPTS_VER}... " mv "cxxopts-${CXXOPTS_VER}" cxxopts fi export CXXOPTS_HOME="$(real_pwd)/cxxopts" + add_cmake_opts -DCXXOPTS_INCLUDE_DIRS="${CXXOPTS_HOME}/include" echo Done. } cd $DEPS diff --git a/apps/mwiniimporter/CMakeLists.txt b/apps/mwiniimporter/CMakeLists.txt index c9eb446589..b7b7b33723 100644 --- a/apps/mwiniimporter/CMakeLists.txt +++ b/apps/mwiniimporter/CMakeLists.txt @@ -14,14 +14,10 @@ openmw_add_executable(openmw-iniimporter ) target_link_libraries(openmw-iniimporter - ${Boost_PROGRAM_OPTIONS_LIBRARY} - ${CXXOPTS_LIBRARY} components ) if (WIN32) - target_link_libraries(openmw-iniimporter - ${Boost_LOCALE_LIBRARY}) INSTALL(TARGETS openmw-iniimporter RUNTIME DESTINATION ".") endif(WIN32)