From 64b12021193ba662ef79cedc3527e6f0ad27483e Mon Sep 17 00:00:00 2001 From: lethosor Date: Sat, 19 Sep 2020 01:17:25 -0400 Subject: [PATCH] Fix some CMake warnings and extraneous output --- .gitmodules | 2 +- CMakeLists.txt | 1 + depends/libexpat | 2 +- depends/xlsxio | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 97d01c993..e548e27f9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,5 +26,5 @@ shallow = true [submodule "depends/libexpat"] path = depends/libexpat - url = ../../libexpat/libexpat.git + url = ../../DFHack/libexpat.git shallow = true diff --git a/CMakeLists.txt b/CMakeLists.txt index 526cb9f7a..ce3104bca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ ## some generic CMake magic cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) +cmake_policy(SET CMP0048 NEW) project(dfhack) if("${CMAKE_GENERATOR}" STREQUAL Ninja) diff --git a/depends/libexpat b/depends/libexpat index d8daead33..26839cce4 160000 --- a/depends/libexpat +++ b/depends/libexpat @@ -1 +1 @@ -Subproject commit d8daead33ee76a29f5184d35b13672b6ce14b4a2 +Subproject commit 26839cce4534ea4ee70ba992a6d7a774c624d584 diff --git a/depends/xlsxio b/depends/xlsxio index f801aeeb7..4056226fe 160000 --- a/depends/xlsxio +++ b/depends/xlsxio @@ -1 +1 @@ -Subproject commit f801aeeb71e6ad70c0c59b8c35ebde47b1eb610e +Subproject commit 4056226fe0df6bff4593ee2353cca07c2b7f327e