From e2cd1fca58929511613bf384b4bdcf23a1e4b288 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 13 May 2018 13:09:51 -0400
Subject: [PATCH] Reorder dfhack-md5 GCC flags, fix another embark-assistant
 warning

---
 depends/md5/CMakeLists.txt          | 2 +-
 plugins/embark-assistant/survey.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/depends/md5/CMakeLists.txt b/depends/md5/CMakeLists.txt
index 84cc24e14..45cbe7e06 100644
--- a/depends/md5/CMakeLists.txt
+++ b/depends/md5/CMakeLists.txt
@@ -2,5 +2,5 @@ project(dfhack-md5)
 ADD_LIBRARY(dfhack-md5 STATIC EXCLUDE_FROM_ALL md5.cpp md5wrapper.cpp)
 IDE_FOLDER(dfhack-md5 "Depends")
 IF(UNIX)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-strict-aliasing")
+    SET_TARGET_PROPERTIES(dfhack-md5 PROPERTIES COMPILE_FLAGS "-Wno-strict-aliasing")
 ENDIF()
diff --git a/plugins/embark-assistant/survey.cpp b/plugins/embark-assistant/survey.cpp
index 4b0d883e3..b057ff290 100644
--- a/plugins/embark-assistant/survey.cpp
+++ b/plugins/embark-assistant/survey.cpp
@@ -781,7 +781,7 @@ void embark_assist::survey::survey_mid_level_tile(embark_assist::defs::geo_data
     survey_results->at(x).at(y).evilness_count[2] = 0;
 
     bool river_elevation_found = false;
-    int16_t river_elevation;
+    int16_t river_elevation = 0;
 
     for (uint8_t i = 0; i < 16; i++) {
         for (uint8_t k = 0; k < 16; k++) {
@@ -1006,7 +1006,7 @@ void embark_assist::survey::survey_embark(embark_assist::defs::mid_level_tiles *
     uint16_t x = screen->location.region_pos.x;
     uint16_t y = screen->location.region_pos.y;
     bool river_found = false;
-    int16_t river_elevation;
+    int16_t river_elevation = 0;
     std::vector<bool> metals(state->max_inorganic);
     std::vector<bool> economics(state->max_inorganic);
     std::vector<bool> minerals(state->max_inorganic);