From f324f46d4b2ff97367e9e97f7db8746d1966accc Mon Sep 17 00:00:00 2001
From: andy5995 <andy400-dev@yahoo.com>
Date: Fri, 14 Sep 2018 13:38:34 -0500
Subject: [PATCH] CMakeLists.txt:fix output path when using build-zg.sh

fixes #227
---
 source/glest_game/CMakeLists.txt       | 4 ++++
 source/glest_map_editor/CMakeLists.txt | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt
index d72009673..f153542ea 100644
--- a/source/glest_game/CMakeLists.txt
+++ b/source/glest_game/CMakeLists.txt
@@ -260,6 +260,10 @@ IF(BUILD_ZETAGLEST)
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-subsystem,console -mconsole")
 	ENDIF()
 
+	IF(WANT_DEV_OUTPATH)
+		SET(EXECUTABLE_OUTPUT_PATH "${ZETAGLEST_FRIENDLY_OUTPUT_PATH}")
+	ENDIF()
+
   MESSAGE(STATUS "\n***Note: The final output path for the ZetaGlest engine will be [${ZETAGLEST_BIN_OUTPUT_DIR}]\n")
 
 	SET_SOURCE_FILES_PROPERTIES(${ZG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt
index aa3de2d87..2fd79906f 100644
--- a/source/glest_map_editor/CMakeLists.txt
+++ b/source/glest_map_editor/CMakeLists.txt
@@ -159,6 +159,10 @@ IF(BUILD_ZETAGLEST_MAP_EDITOR)
 			ENDIF(APPLE)
 	ENDFOREACH(DIR)
 
+	IF(WANT_DEV_OUTPATH)
+		SET(EXECUTABLE_OUTPUT_PATH "${ZETAGLEST_FRIENDLY_OUTPUT_PATH}")
+	ENDIF()
+
         SET(HELP2MAN_OUT_PATH ${EXECUTABLE_OUTPUT_PATH})
         IF("${EXECUTABLE_OUTPUT_PATH}" STREQUAL "")
                 SET(HELP2MAN_OUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/")