From 5ada9ee2013c4c3ce4394cc37217f37bf6637349 Mon Sep 17 00:00:00 2001
From: Vitaliy Kirsanov <krokoziabla@yandex-team.ru>
Date: Thu, 14 Mar 2019 19:03:29 +0300
Subject: [PATCH] Use native CMakeLists.txt for libexpat

cmake-proxies/expat/CMakeLists.txt seems to make more problems than it
solves. But the native one appears doing its job well on multiple
platforms. Tested on Windows, OSX, Linux and FreeBSD.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Author:    Vitaliy Kirsanov <krokoziabla@yandex-team.ru>
# Date:      Thu Mar 14 19:03:29 2019 +0300
#
# On branch tmp
# Your branch is up to date with 'my/tmp'.
#
# Changes to be committed:
#	modified:   cmake-proxies/CMakeLists.txt
#	deleted:    cmake-proxies/expat/CMakeLists.txt
#	modified:   lib-src/expat/CMakeLists.txt
#
# Changes not staged for commit:
#	modified:   lib-src/expat/CMakeLists.txt
#
---
 cmake-proxies/CMakeLists.txt       |  9 ++++--
 cmake-proxies/expat/CMakeLists.txt | 51 ------------------------------
 lib-src/expat/CMakeLists.txt       |  2 +-
 3 files changed, 7 insertions(+), 55 deletions(-)
 delete mode 100644 cmake-proxies/expat/CMakeLists.txt

diff --git a/cmake-proxies/CMakeLists.txt b/cmake-proxies/CMakeLists.txt
index de2aa5281..a0fb955be 100644
--- a/cmake-proxies/CMakeLists.txt
+++ b/cmake-proxies/CMakeLists.txt
@@ -9,11 +9,14 @@ set( LIB_SRC_DIRECTORY ${top_dir}/lib-src/ )
 #add_subdirectory( "mod-track-panel" )
 
 #These are all headers, nothing to build.
-#add_subdirectory( "ffmpeg" ) 
-#add_subdirectory( "lame" ) 
+#add_subdirectory( "ffmpeg" )
+#add_subdirectory( "lame" )
 
 
-add_subdirectory( "expat" )
+# libexpat
+set( BUILD_shared OFF CACHE INTERNAL "" FORCE )
+add_subdirectory( "${LIB_SRC_DIRECTORY}expat" "${CMAKE_CURRENT_BINARY_DIR}/expat" EXCLUDE_FROM_ALL )
+
 add_subdirectory( "FileDialog" )
 #add_subdirectory( "help" )
 add_subdirectory( "libflac" )
diff --git a/cmake-proxies/expat/CMakeLists.txt b/cmake-proxies/expat/CMakeLists.txt
deleted file mode 100644
index 7ba072a55..000000000
--- a/cmake-proxies/expat/CMakeLists.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-#directory cmake-proxies/expat
-set( TARGET expat )
-set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} )
-project( ${TARGET} )
-
-set( SOURCES
-#${LIB_SRC_DIRECTORY}expat/amiga/expat_68k.c
-#${LIB_SRC_DIRECTORY}expat/amiga/expat_68k_handler_stubs.c
-#${LIB_SRC_DIRECTORY}expat/amiga/expat_lib.c
-#${LIB_SRC_DIRECTORY}expat/amiga/expat_vectors.c
-#${LIB_SRC_DIRECTORY}expat/amiga/launch.c
-#${LIB_SRC_DIRECTORY}expat/examples/elements.c
-#${LIB_SRC_DIRECTORY}expat/examples/outline.c
-
-${LIB_SRC_DIRECTORY}expat/lib/xmlparse.c
-${LIB_SRC_DIRECTORY}expat/lib/xmlrole.c
-${LIB_SRC_DIRECTORY}expat/lib/xmltok.c
-${LIB_SRC_DIRECTORY}expat/lib/xmltok_impl.c
-${LIB_SRC_DIRECTORY}expat/lib/xmltok_ns.c
-
-#${LIB_SRC_DIRECTORY}expat/tests/chardata.c
-#${LIB_SRC_DIRECTORY}expat/tests/minicheck.c
-#${LIB_SRC_DIRECTORY}expat/tests/runtests.c
-#${LIB_SRC_DIRECTORY}expat/tests/benchmark/benchmark.c
-#${LIB_SRC_DIRECTORY}expat/xmlwf/codepage.c
-#${LIB_SRC_DIRECTORY}expat/xmlwf/ct.c
-#${LIB_SRC_DIRECTORY}expat/xmlwf/readfilemap.c
-#${LIB_SRC_DIRECTORY}expat/xmlwf/unixfilemap.c
-#${LIB_SRC_DIRECTORY}expat/xmlwf/win32filemap.c
-#${LIB_SRC_DIRECTORY}expat/xmlwf/xmlfile.c
-#${LIB_SRC_DIRECTORY}expat/xmlwf/xmlmime.c
-#${LIB_SRC_DIRECTORY}expat/xmlwf/xmlwf.c
-
-#${LIB_SRC_DIRECTORY}expat/tests/runtestspp.cpp
-)
-# This defines the #define on both Windows and Linux.
-add_definitions(-D_LIB)
-
-if(APPLE)
-    add_definitions(-DMACOS_CLASSIC)
-else()
-    add_definitions(-DCOMPILED_FROM_DSP)
-endif()
-
-add_library( ${TARGET} STATIC ${SOURCES})
-
-target_include_directories( ${TARGET} PRIVATE
-${TARGET_SOURCE}/lib
-)
-
-target_link_libraries( ${TARGET} )
diff --git a/lib-src/expat/CMakeLists.txt b/lib-src/expat/CMakeLists.txt
index bc930571b..c4b8a2338 100755
--- a/lib-src/expat/CMakeLists.txt
+++ b/lib-src/expat/CMakeLists.txt
@@ -37,7 +37,7 @@ endif(BUILD_tests)
 
 include(ConfigureChecks.cmake)
 
-include_directories(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/lib)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 if(MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS -wd4996)
 endif(MSVC)