From ba13bab4b7685be9fe20baa4f38e2534c7739942 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Thu, 14 Apr 2022 16:25:48 -0400 Subject: [PATCH] Restore unshield support, and add cmake find_package for pugimxl --- CMakeLists.txt | 8 +++++++- src/installextract.cpp | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 82cfa6b..8adb12f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,6 +61,8 @@ else() set(LIBRARIES zlibstatic ${LIBRARIES}) endif() +find_package(pugixml REQUIRED) + add_library(libxiv STATIC src/fiinparser.cpp src/indexparser.cpp @@ -75,10 +77,14 @@ add_library(libxiv STATIC src/mdlparser.cpp src/havokxmlparser.cpp) target_include_directories(libxiv PUBLIC include PRIVATE src) -target_link_libraries(libxiv PUBLIC ${LIBRARIES} pugixml) +target_link_libraries(libxiv PUBLIC ${LIBRARIES} pugixml::pugixml) target_link_directories(libxiv PUBLIC ${LIB_DIRS}) target_compile_features(libxiv PUBLIC cxx_std_17) set_target_properties(libxiv PROPERTIES CXX_EXTENSIONS OFF) +if(NOT WIN32) + target_compile_definitions(libxiv PUBLIC UNSHIELD_SUPPORTED) +endif() + install(TARGETS libxiv DESTINATION "${INSTALL_LIB_PATH}") \ No newline at end of file diff --git a/src/installextract.cpp b/src/installextract.cpp index 494f6cd..eef45d5 100644 --- a/src/installextract.cpp +++ b/src/installextract.cpp @@ -2,6 +2,7 @@ #ifdef UNSHIELD_SUPPORTED #include +#include #include #include #include