Fix some CMake warnings and extraneous output

2020-09-19 01:17:25 -04:00 · 2020-09-19 01:17:25 -04:00 · 64b1202119
parent 89210eaf29
commit 64b1202119
4 changed files with 4 additions and 3 deletions
--- 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
--- 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)
--- a/depends/libexpat
+++ b/depends/libexpat
@ -1 +1 @@
-Subproject commit d8daead33ee76a29f5184d35b13672b6ce14b4a2
+Subproject commit 26839cce4534ea4ee70ba992a6d7a774c624d584
--- a/depends/xlsxio
+++ b/depends/xlsxio
@ -1 +1 @@
-Subproject commit f801aeeb71e6ad70c0c59b8c35ebde47b1eb610e
+Subproject commit 4056226fe0df6bff4593ee2353cca07c2b7f327e