From 85fbcf04282d4266c3b0c73cec9aeb5356519683 Mon Sep 17 00:00:00 2001
From: Edoardo Prezioso <edo88@email.it>
Date: Sat, 20 Feb 2016 11:38:30 +0100
Subject: [PATCH] - Improve CMake messages for zlib/jpeg/bzip2/gme.

* Report the include location if they're external libraries;
* Remove unneeded include location messages from zipdir.
---
 CMakeLists.txt              | 8 ++++----
 tools/zipdir/CMakeLists.txt | 5 +----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a42c515e8..a0da51d230 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -197,7 +197,7 @@ elseif( MSVC )
 endif()
 
 if( ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB )
-	message( STATUS "Using system zlib" )
+	message( STATUS "Using system zlib, includes found at ${ZLIB_INCLUDE_DIR}" )
 else()
 	message( STATUS "Using internal zlib" )
 	add_subdirectory( zlib )
@@ -207,7 +207,7 @@ else()
 endif()
 
 if( JPEG_FOUND AND NOT FORCE_INTERNAL_JPEG )
-	message( STATUS "Using system jpeg library" )
+	message( STATUS "Using system jpeg library, includes found at ${JPEG_INCLUDE_DIR}" )
 else()
 	message( STATUS "Using internal jpeg library" )
 	add_subdirectory( jpeg-6b )
@@ -217,7 +217,7 @@ else()
 endif()
 
 if( BZIP2_FOUND AND NOT FORCE_INTERNAL_BZIP2 )
-	message( STATUS "Using system bzip2 library" )
+	message( STATUS "Using system bzip2 library, includes found at ${BZIP2_INCLUDE_DIR}" )
 else()
 	message( STATUS "Using internal bzip2 library" )
 	add_subdirectory( bzip2 )
@@ -227,7 +227,7 @@ else()
 endif()
 
 if( GME_FOUND AND NOT FORCE_INTERNAL_GME )
-	message( STATUS "Using system gme library ${GME_INCLUDE_DIR}" )
+	message( STATUS "Using system gme library, includes found at ${GME_INCLUDE_DIR}" )
 else()
 	message( STATUS "Using internal gme library" )
 	add_subdirectory( game-music-emu )
diff --git a/tools/zipdir/CMakeLists.txt b/tools/zipdir/CMakeLists.txt
index d8a50da69c..6a36b2cb5d 100644
--- a/tools/zipdir/CMakeLists.txt
+++ b/tools/zipdir/CMakeLists.txt
@@ -1,9 +1,6 @@
 cmake_minimum_required( VERSION 2.8.7 )
 
-if(NOT CMAKE_CROSSCOMPILING)
-	message(STATUS "${ZLIB_INCLUDE_DIR}" )
-	message(STATUS "${BZIP2_INCLUDE_DIR}" )
-	message(STATUS "${LZMA_INCLUDE_DIR}" )
+if( NOT CMAKE_CROSSCOMPILING )
 	include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" )
 	add_executable( zipdir
 		zipdir.c )